see CHANGES.md

Author: tyler-gilbert

CHANGES.md

@@ -4,7 +4,7 @@
 
 > Important! `fs::TemporaryDirectory()` which is not used often was moved to `sys::TemporaryDirectory()` to avoid a circular dependency between SysAPI and FsAPI. This is a symantic versioning breaking change (though a small one)
 
-
+- Updates to CMake test structure, added `API_test` target
 - Improved performance of `File::get_line()`
 - Add `StrackString<>::truncate()` method
 - Better test integration with super projects (`api_tests` target)

CMakeLists.txt

@@ -1,26 +1,11 @@
 cmake_minimum_required (VERSION 3.12)
 
-if(NOT SOS_SDK_PATH)
-	set(SOS_SDK_PATH $ENV{SOS_SDK_PATH})
-endif()
-
-set(CMAKE_MODULE_PATH ${SOS_SDK_PATH}/cmake)
-set(CMAKE_TOOLCHAIN_FILE ${CMAKE_MODULE_PATH}/sos-toolchain.cmake)
-
 set(API_PROJECT_VERSION 1.1.0 CACHE INTERNAL "API version")
 project(API
 	LANGUAGES CXX C
 	VERSION ${API_PROJECT_VERSION}
 	)
 
-include(sos-sdk)
-
-
-if(SOS_IS_ARM AND NOT DEFINED API_IS_SDK)
-	include(StratifyOS)
-endif()
-
-include(CTest)
 
 add_subdirectory(libraries/API API)
 add_subdirectory(libraries/VarAPI VarAPI)
@@ -33,7 +18,11 @@ add_subdirectory(libraries/TestAPI TestAPI)
 
 option(API_IS_TEST "Enable test builds for API" OFF)
 
+# Always available so dependency libs can use it
+add_custom_target(API_test ALL)
+
 if(API_IS_TEST)
+	include(CTest)
 	add_subdirectory(tests tests)
 endif()
 

libraries/API.cmake

@@ -111,7 +111,7 @@ function(api_add_test_executable NAME RAM_SIZE DEPENDENCIES)
 	sos_sdk_app_target(RELEASE ${LOCAL_NAME} "unittest" release ${SOS_ARCH})
   message(STATUS "API UnitTest Executable ${RELEASE_TARGET}")
 	add_executable(${RELEASE_TARGET})
-	add_dependencies(api_tests ${RELEASE_TARGET})
+	add_dependencies(API_test ${RELEASE_TARGET})
 	target_sources(${RELEASE_TARGET}
 		PRIVATE
 		${CMAKE_CURRENT_SOURCE_DIR}/src/main.cpp

tests/API/api.cmake

@@ -2,7 +2,7 @@
 macro(api_test_executable NAME DIRECTORIES)
   sos_sdk_app_target(RELEASE ${NAME} "unittest" release ${SOS_ARCH})
   add_executable(${RELEASE_TARGET})
-  add_dependencies(api_tests ${RELEASE_TARGET})
+  add_dependencies(API_test ${RELEASE_TARGET})
 
   target_sources(${RELEASE_TARGET}
     PRIVATE
@@ -55,6 +55,7 @@ macro(api_test_executable NAME DIRECTORIES)
 
   if (SOS_IS_LINK)
     sos_sdk_add_test(${NAME} "unittest" release)
+    set_tests_properties(${NAME}_release PROPERTIES DEPENDS API_Test)
     #sos_sdk_add_test(${NAME} "unittest" coverage)
   endif ()
 

tests/CMakeLists.txt

@@ -1,14 +1,5 @@
 cmake_minimum_required(VERSION 3.12)
 
-if (NOT SOS_SDK_PATH)
-  set(SOS_SDK_PATH $ENV{SOS_SDK_PATH})
-endif ()
-
-set(CMAKE_MODULE_PATH ${SOS_SDK_PATH}/cmake)
-set(CMAKE_TOOLCHAIN_FILE ${CMAKE_MODULE_PATH}/sos-toolchain.cmake)
-include(sos-sdk)
-
-add_custom_target(api_tests)
 
 add_subdirectory(API testsAPI)
 add_subdirectory(ChronoAPI testsChronoAPI)
@@ -17,25 +8,4 @@ add_subdirectory(VarAPI testsVarAPI)
 add_subdirectory(ThreadAPI testsThreadAPI)
 
 
-add_custom_target(coverage
-  DEPENDS coverage_test
-  coverage_ThreadAPI_coverage_link
-  coverage_FsAPI_coverage_link
-  coverage_ChronoAPI_coverage_link
-  coverage_VarAPI_coverage_link
-  )
-
-add_custom_target(coverage_test
-  COMMAND ctest -VV
-  DEPENDS clean_coverage
-  )
-
-add_custom_target(clean_coverage
-  DEPENDS
-  clean_coverage_ThreadAPI_coverage_link
-  clean_coverage_FsAPI_coverage_link
-  clean_coverage_ChronoAPI_coverage_link
-  clean_coverage_VarAPI_coverage_link
-  )
-
 

tests/ThreadAPI/CMakeLists.txt

@@ -1,14 +1,6 @@
 #Copy this file to the application project folder as CMakeLists.txt
 cmake_minimum_required(VERSION 3.12)
 
-if (NOT SOS_SDK_PATH)
-  set(SOS_SDK_PATH $ENV{SOS_SDK_PATH})
-endif ()
-
-set(CMAKE_MODULE_PATH ${SOS_SDK_PATH}/cmake)
-set(CMAKE_TOOLCHAIN_FILE ${CMAKE_MODULE_PATH}/sos-toolchain.cmake)
-include(sos-sdk)
-
 get_filename_component(SOS_NAME ${CMAKE_CURRENT_LIST_DIR} NAME)
 project(${SOS_NAME} CXX C)
 
@@ -27,3 +19,4 @@ set(DIRECTORIES
 api_test_executable(ThreadAPI "${DIRECTORIES}")
 
 
+