ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #14870 from ARMmbed/move_rtos_stub_headers 

CMake: Remove mbed-stubs-rtos-headers library
pull/14904/head
Martin Kojtal 2021-07-09 10:33:49 +02:00 committed by GitHub
parent 705c61b0c2 bb3cd37a5e
commit 8a507e651e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -23,6 +23,7 @@ option(BUILD_TESTING "Run unit tests only." OFF)
if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING) if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
include(CTest) include(CTest)
add_definitions(-DUNITTEST)
add_subdirectory(UNITTESTS) add_subdirectory(UNITTESTS)
endif() endif()

2
UNITTESTS/CMakeLists.txt
View File

@ -5,8 +5,6 @@
set(CMAKE_CXX_STANDARD 14 CACHE STRING "") set(CMAKE_CXX_STANDARD 14 CACHE STRING "")
set(CMAKE_CXX_STANDARD_REQUIRED ON CACHE BOOL "") set(CMAKE_CXX_STANDARD_REQUIRED ON CACHE BOOL "")
add_definitions(-DUNITTEST)
if (MINGW) if (MINGW)
# enable PRIx formatting globally # enable PRIx formatting globally
add_definitions(-D__STDC_FORMAT_MACROS) add_definitions(-D__STDC_FORMAT_MACROS)

1
UNITTESTS/stubs/connectivity/CMakeLists.txt
View File

@ -28,7 +28,6 @@ target_sources(mbed-stubs-connectivity
target_link_libraries(mbed-stubs-connectivity target_link_libraries(mbed-stubs-connectivity
PRIVATE PRIVATE
mbed-stubs-rtos-headers
mbed-headers mbed-headers
mbed-stubs-headers mbed-stubs-headers
mbed-stubs-rtos mbed-stubs-rtos

1
connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt
View File

@ -31,7 +31,6 @@ target_link_libraries(${TEST_NAME}
mbed-stubs-netsocket mbed-stubs-netsocket
mbed-stubs-cellular mbed-stubs-cellular
mbed-stubs-headers mbed-stubs-headers
mbed-stubs-rtos-headers
gmock_main gmock_main
) )

1
connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt
View File

@ -33,7 +33,6 @@ target_link_libraries(${TEST_NAME}
mbed-stubs mbed-stubs
mbed-stubs-cellular mbed-stubs-cellular
mbed-stubs-headers mbed-stubs-headers
mbed-stubs-rtos-headers
gmock_main gmock_main
) )

1
connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt
View File

@ -34,7 +34,6 @@ target_link_libraries(${TEST_NAME}
mbed-stubs mbed-stubs
mbed-stubs-cellular mbed-stubs-cellular
mbed-stubs-headers mbed-stubs-headers
mbed-stubs-rtos-headers
gmock_main gmock_main
) )

1
connectivity/netsocket/tests/UNITTESTS/doubles/CMakeLists.txt
View File

@ -30,7 +30,6 @@ target_sources(mbed-stubs-netsocket
target_link_libraries(mbed-stubs-netsocket target_link_libraries(mbed-stubs-netsocket
PRIVATE PRIVATE
mbed-headers-netsocket mbed-headers-netsocket
mbed-stubs-rtos-headers
mbed-headers mbed-headers
mbed-stubs-headers mbed-stubs-headers
mbed-stubs-rtos mbed-stubs-rtos

6
rtos/tests/UNITTESTS/doubles/CMakeLists.txt
View File

@ -9,15 +9,13 @@ target_include_directories(mbed-headers-rtos
${mbed-os_SOURCE_DIR}/rtos/include/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 INTERFACE
. .
) )
add_library(mbed-stubs-rtos)
target_compile_definitions(mbed-stubs-rtos target_compile_definitions(mbed-stubs-rtos
PRIVATE PRIVATE
MBED_CONF_RTOS_PRESENT=1 MBED_CONF_RTOS_PRESENT=1