From bb3cd37a5e10630189920fe475865db57a215c5e Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Mon, 5 Jul 2021 03:25:07 -0700 Subject: [PATCH] CMake: Remove mbed-stubs-rtos-headers library - 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 --- CMakeLists.txt | 1 + UNITTESTS/CMakeLists.txt | 2 -- UNITTESTS/stubs/connectivity/CMakeLists.txt | 1 - .../framework/AT/at_cellularcontext/CMakeLists.txt | 1 - .../UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt | 1 - .../framework/device/cellularstatemachine/CMakeLists.txt | 1 - .../netsocket/tests/UNITTESTS/doubles/CMakeLists.txt | 1 - rtos/tests/UNITTESTS/doubles/CMakeLists.txt | 6 ++---- 8 files changed, 3 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f85615fc9c..ca5185f16f 100644 --- 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 index 35e26dbe44..8fb608a6ed 100644 --- 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 index 2e70a42ebf..895212b08e 100644 --- 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 index b2ce284501..ac50d03653 100644 --- 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 index 2361dff4ff..1f84162a9d 100644 --- 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 index ab3529d51a..24cdefd4d2 100644 --- 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 index 634caa0b3d..c9b0768db1 100644 --- 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 index e827f16d45..babf17c920 100644 --- 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