mirror of https://github.com/ARMmbed/mbed-os.git
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 macropull/14870/head
parent
e145ae3acd
commit
bb3cd37a5e
|
@ -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()
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -31,7 +31,6 @@ target_link_libraries(${TEST_NAME}
|
|||
mbed-stubs-netsocket
|
||||
mbed-stubs-cellular
|
||||
mbed-stubs-headers
|
||||
mbed-stubs-rtos-headers
|
||||
gmock_main
|
||||
)
|
||||
|
||||
|
|
|
@ -33,7 +33,6 @@ target_link_libraries(${TEST_NAME}
|
|||
mbed-stubs
|
||||
mbed-stubs-cellular
|
||||
mbed-stubs-headers
|
||||
mbed-stubs-rtos-headers
|
||||
gmock_main
|
||||
)
|
||||
|
||||
|
|
|
@ -34,7 +34,6 @@ target_link_libraries(${TEST_NAME}
|
|||
mbed-stubs
|
||||
mbed-stubs-cellular
|
||||
mbed-stubs-headers
|
||||
mbed-stubs-rtos-headers
|
||||
gmock_main
|
||||
)
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue