CMake: Remove mbed-stubs-rtos-headers library

rajkan01 · rajkan01 · commit bb3cd37a5e10 · 2021-07-08T07:14:56.000-07:00
- Previous changes moved all rtos stubs headers into mbed-stubs-rtos-headers
lib, but the decision to keep all stubs headers under the respective
component stubs library so moved all stubs rtos headers under
mbed-stubs-rtos and updated it depend component CMake
- Remove unnecessary add_definition call for UNITTEST as any of the stubs library
added from UNITTEST/CMakeLists.txt is not required this macro
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,6 +21,7 @@ option(BUILD_TESTING "Run unit tests only." OFF)
 
 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
     include(CTest)
+    add_definitions(-DUNITTEST)
     add_subdirectory(UNITTESTS)
 endif()
 
diff --git a/UNITTESTS/CMakeLists.txt b/UNITTESTS/CMakeLists.txt
@@ -5,8 +5,6 @@
 set(CMAKE_CXX_STANDARD 14 CACHE STRING "")
 set(CMAKE_CXX_STANDARD_REQUIRED ON CACHE BOOL "")
 
-add_definitions(-DUNITTEST)
-
 if (MINGW)
     # enable PRIx formatting globally
     add_definitions(-D__STDC_FORMAT_MACROS)
diff --git a/UNITTESTS/stubs/connectivity/CMakeLists.txt b/UNITTESTS/stubs/connectivity/CMakeLists.txt
@@ -28,7 +28,6 @@ target_sources(mbed-stubs-connectivity
 
 target_link_libraries(mbed-stubs-connectivity
     PRIVATE
-        mbed-stubs-rtos-headers
         mbed-headers
         mbed-stubs-headers
         mbed-stubs-rtos
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt
@@ -31,7 +31,6 @@ target_link_libraries(${TEST_NAME}
         mbed-stubs-netsocket
         mbed-stubs-cellular
         mbed-stubs-headers
-        mbed-stubs-rtos-headers
         gmock_main
 )
 
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt
@@ -33,7 +33,6 @@ target_link_libraries(${TEST_NAME}
         mbed-stubs
         mbed-stubs-cellular
         mbed-stubs-headers
-        mbed-stubs-rtos-headers
         gmock_main
 )
 
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt
@@ -34,7 +34,6 @@ target_link_libraries(${TEST_NAME}
         mbed-stubs
         mbed-stubs-cellular
         mbed-stubs-headers
-        mbed-stubs-rtos-headers
         gmock_main
 )
 
diff --git a/connectivity/netsocket/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -30,7 +30,6 @@ target_sources(mbed-stubs-netsocket
 target_link_libraries(mbed-stubs-netsocket
     PRIVATE
         mbed-headers-netsocket
-        mbed-stubs-rtos-headers
         mbed-headers
         mbed-stubs-headers
         mbed-stubs-rtos
diff --git a/rtos/tests/UNITTESTS/doubles/CMakeLists.txt b/rtos/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -9,15 +9,13 @@ target_include_directories(mbed-headers-rtos
         ${mbed-os_SOURCE_DIR}/rtos/include/rtos
 )
 
-add_library(mbed-stubs-rtos-headers INTERFACE)
+add_library(mbed-stubs-rtos)
 
-target_include_directories(mbed-stubs-rtos-headers
+target_include_directories(mbed-stubs-rtos
     INTERFACE
         .
 )
 
-add_library(mbed-stubs-rtos)
-
 target_compile_definitions(mbed-stubs-rtos
     PRIVATE
         MBED_CONF_RTOS_PRESENT=1

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ target_link_libraries(${TEST_NAME}`
`31`	`31`	`mbed-stubs-netsocket`
`32`	`32`	`mbed-stubs-cellular`
`33`	`33`	`mbed-stubs-headers`
`34`		`- mbed-stubs-rtos-headers`
`35`	`34`	`gmock_main`
`36`	`35`	`)`
`37`	`36`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ target_link_libraries(${TEST_NAME}`
`33`	`33`	`mbed-stubs`
`34`	`34`	`mbed-stubs-cellular`
`35`	`35`	`mbed-stubs-headers`
`36`		`- mbed-stubs-rtos-headers`
`37`	`36`	`gmock_main`
`38`	`37`	`)`
`39`	`38`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ target_link_libraries(${TEST_NAME}`
`34`	`34`	`mbed-stubs`
`35`	`35`	`mbed-stubs-cellular`
`36`	`36`	`mbed-stubs-headers`
`37`		`- mbed-stubs-rtos-headers`
`38`	`37`	`gmock_main`
`39`	`38`	`)`
`40`	`39`
Original file line number	Diff line number	Diff line change
`@@ -9,15 +9,13 @@ target_include_directories(mbed-headers-rtos`
`9`	`9`	`${mbed-os_SOURCE_DIR}/rtos/include/rtos`
`10`	`10`	`)`
`11`	`11`
`12`		`-add_library(mbed-stubs-rtos-headers INTERFACE)`
	`12`	`+add_library(mbed-stubs-rtos)`
`13`	`13`
`14`		`-target_include_directories(mbed-stubs-rtos-headers`
	`14`	`+target_include_directories(mbed-stubs-rtos`
`15`	`15`	`INTERFACE`
`16`	`16`	`.`
`17`	`17`	`)`
`18`	`18`
`19`		`-add_library(mbed-stubs-rtos)`
`20`		`-`
`21`	`19`	`target_compile_definitions(mbed-stubs-rtos`
`22`	`20`	`PRIVATE`
`23`	`21`	`MBED_CONF_RTOS_PRESENT=1`