CI - teach the api-tests were the actual test cpp files are

Author: samaaron

app/api-tests/CMakeLists.txt

@@ -1,46 +1,50 @@
 project(api-tests)
 
 set(TESTS_ROOT ${CMAKE_CURRENT_LIST_DIR})
-set(VENDOR_DIR "${TESTS_ROOT}/vendor")
 
-add_subdirectory("${VENDOR_DIR}/Catch2-3.8.0")
+set(APP_ROOT "${TESTS_ROOT}/../api")
+
+find_package(Catch2 CONFIG REQUIRED)
 
 set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
 set(THREADS_PREFER_PTHREAD_FLAG TRUE)
 
-file(GLOB_RECURSE FOUND_TEST_SOURCES "${TESTS_ROOT}/*.test.cpp")
+# list(APPEND TEST_SOURCES ${TESTS_ROOT}/CMakeLists.txt)
 
-enable_testing()
+file(GLOB_RECURSE FOUND_TEST_SOURCES "${APP_ROOT}/*.test.cpp")
 
-set (TEST_SOURCES
-    ${FOUND_TEST_SOURCES}
-    ${TEST_SOURCES}
-    )
+enable_testing()
 
-add_executable(${PROJECT_NAME} ${TEST_SOURCES})
+# Set TEST_SOURCES to the found test files.
+set(TEST_SOURCES ${FOUND_TEST_SOURCES})
 
-target_include_directories(${PROJECT_NAME} PRIVATE
-    ${CMAKE_BINARY_DIR}
-    include
-    )
+if(NOT TEST_SOURCES)
+  message(WARNING "No test source files found in ${APP_ROOT}.")
+endif()
 
+if(TEST_SOURCES)
+  add_executable(${PROJECT_NAME} ${TEST_SOURCES})
 
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-find_package(Threads REQUIRED)
-set(PLATFORM_LINKLIBS
-    Threads::Threads
-	)
-endif()
+  target_include_directories(${PROJECT_NAME} PRIVATE
+      ${CMAKE_BINARY_DIR}
+      include
+  )
 
-target_link_libraries(${PROJECT_NAME}
-    PRIVATE
-        SonicPi::API
-        Catch2::Catch2WithMain
-        ${PLATFORM_LINKLIBS}
-        ${CMAKE_THREAD_LIBS_INIT})
+  if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+    find_package(Threads REQUIRED)
+    set(PLATFORM_LINKLIBS Threads::Threads)
+  endif()
 
-add_test(${PROJECT_NAME} ${PROJECT_NAME})
+  target_link_libraries(${PROJECT_NAME}
+      PRIVATE
+          SonicPi::API
+          Catch2::Catch2WithMain
+          ${PLATFORM_LINKLIBS}
+          ${CMAKE_THREAD_LIBS_INIT}
+  )
 
-SOURCE_GROUP(tests REGULAR_EXPRESSION ".*.test.(cpp|h)+")
-SOURCE_GROUP(tests FILES ${TEST_SOURCES})
+  add_test(${PROJECT_NAME} ${PROJECT_NAME})
 
+  SOURCE_GROUP(tests REGULAR_EXPRESSION ".*.test.(cpp|h)+")
+  SOURCE_GROUP(tests FILES ${TEST_SOURCES})
+endif()