Skip to content

Commit c01d417

Browse files
committed
CMake: connectivity: Unify checks for unit and greentea tests
Subdirectories should always be included in the CMake "all" target when building any tests, either unit tests or greentea tests.
1 parent d954841 commit c01d417

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

connectivity/CMakeLists.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,15 @@ add_library(mbed-nfc INTERFACE)
2424
add_library(mbed-ppp INTERFACE)
2525
add_library(mbed-wifi INTERFACE)
2626

27-
if(${CMAKE_CROSSCOMPILING})
27+
if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
28+
# Add these subdirectories for tests
29+
add_subdirectory(cellular)
30+
add_subdirectory(FEATURE_BLE)
31+
add_subdirectory(libraries)
32+
add_subdirectory(lorawan)
33+
add_subdirectory(mbedtls)
34+
add_subdirectory(netsocket)
35+
else()
2836
# The directories below contain optional target libraries
2937
add_subdirectory(FEATURE_BLE EXCLUDE_FROM_ALL)
3038
add_subdirectory(cellular EXCLUDE_FROM_ALL)
@@ -36,12 +44,4 @@ if(${CMAKE_CROSSCOMPILING})
3644
add_subdirectory(nanostack EXCLUDE_FROM_ALL)
3745
add_subdirectory(netsocket EXCLUDE_FROM_ALL)
3846
add_subdirectory(nfc EXCLUDE_FROM_ALL)
39-
else()
40-
# Add these subdirectories for the Unit test
41-
add_subdirectory(cellular)
42-
add_subdirectory(lorawan)
43-
add_subdirectory(netsocket)
44-
add_subdirectory(mbedtls)
45-
add_subdirectory(libraries)
46-
add_subdirectory(FEATURE_BLE)
4747
endif()

0 commit comments

Comments
 (0)