Skip to content

Commit 6d4caad

Browse files
rajkan01rajkan01
committed
CMake: Move CMAKE_CROSSCOMPILING check inside library CMake
1 parent 10625b3 commit 6d4caad

File tree

5 files changed

+55
-48
lines changed

5 files changed

+55
-48
lines changed

‎CMakeLists.txt‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -147,18 +147,10 @@ add_subdirectory(drivers)
147147
add_subdirectory(hal)
148148
add_subdirectory(platform)
149149
add_subdirectory(rtos)
150-
151-
if(${CMAKE_CROSSCOMPILING})
152-
add_subdirectory(targets)
153-
# The directories below contain optional target libraries
154-
add_subdirectory(connectivity EXCLUDE_FROM_ALL)
155-
add_subdirectory(storage EXCLUDE_FROM_ALL)
156-
add_subdirectory(events EXCLUDE_FROM_ALL)
157-
else()
158-
add_subdirectory(connectivity)
159-
add_subdirectory(storage)
160-
add_subdirectory(events)
161-
endif()
150+
add_subdirectory(targets)
151+
add_subdirectory(storage)
152+
add_subdirectory(events)
153+
add_subdirectory(connectivity)
162154

163155
# The directories below contain optional target libraries
164156
add_subdirectory(drivers/device_key EXCLUDE_FROM_ALL)

‎connectivity/CMakeLists.txt‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,21 @@ add_library(mbed-nfc INTERFACE)
2424
add_library(mbed-ppp INTERFACE)
2525
add_library(mbed-wifi INTERFACE)
2626

27-
28-
add_subdirectory(FEATURE_BLE)
29-
add_subdirectory(cellular)
30-
add_subdirectory(drivers)
31-
add_subdirectory(libraries)
32-
add_subdirectory(lorawan)
33-
add_subdirectory(lwipstack)
34-
add_subdirectory(mbedtls)
35-
add_subdirectory(nanostack)
36-
add_subdirectory(netsocket)
37-
add_subdirectory(nfc)
27+
if(${CMAKE_CROSSCOMPILING})
28+
# The directories below contain optional target libraries
29+
add_subdirectory(FEATURE_BLE EXCLUDE_FROM_ALL)
30+
add_subdirectory(cellular EXCLUDE_FROM_ALL)
31+
add_subdirectory(drivers EXCLUDE_FROM_ALL)
32+
add_subdirectory(libraries EXCLUDE_FROM_ALL)
33+
add_subdirectory(lorawan EXCLUDE_FROM_ALL)
34+
add_subdirectory(lwipstack EXCLUDE_FROM_ALL)
35+
add_subdirectory(mbedtls EXCLUDE_FROM_ALL)
36+
add_subdirectory(nanostack EXCLUDE_FROM_ALL)
37+
add_subdirectory(netsocket EXCLUDE_FROM_ALL)
38+
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+
endif()

‎events/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33

44
if(NOT ${CMAKE_CROSSCOMPILING})
55
add_subdirectory(tests/UNITTESTS)
6-
endif()
7-
6+
else()
87
add_library(mbed-events INTERFACE)
98

109
target_include_directories(mbed-events
@@ -28,3 +27,4 @@ target_compile_definitions(mbed-events
2827
INTERFACE
2928
MBED_CONF_EVENTS_PRESENT=1
3029
)
30+
endif()

‎storage/CMakeLists.txt‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,17 @@ add_library(mbed-storage-kv-config INTERFACE)
2626
add_library(mbed-storage-direct-access-devicekey INTERFACE)
2727
add_library(mbed-storage-kv-global-api INTERFACE)
2828

29-
30-
add_subdirectory(blockdevice)
31-
add_subdirectory(filesystem)
32-
add_subdirectory(kvstore)
33-
add_subdirectory(platform)
29+
if(${CMAKE_CROSSCOMPILING})
30+
# The directories below contain optional target libraries
31+
add_subdirectory(blockdevice EXCLUDE_FROM_ALL)
32+
add_subdirectory(filesystem EXCLUDE_FROM_ALL)
33+
add_subdirectory(kvstore EXCLUDE_FROM_ALL)
34+
add_subdirectory(platform EXCLUDE_FROM_ALL)
35+
else()
36+
# Add these subdirectories for the Unit test
37+
add_subdirectory(blockdevice)
38+
add_subdirectory(kvstore)
39+
endif()
3440

3541
target_include_directories(mbed-storage
3642
INTERFACE

‎targets/CMakeLists.txt‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
include(mbed_set_linker_script)
5-
6-
add_subdirectory(TARGET_Ambiq_Micro EXCLUDE_FROM_ALL)
7-
add_subdirectory(TARGET_Analog_Devices EXCLUDE_FROM_ALL)
8-
add_subdirectory(TARGET_ARM_FM EXCLUDE_FROM_ALL)
9-
add_subdirectory(TARGET_ARM_SSG EXCLUDE_FROM_ALL)
10-
add_subdirectory(TARGET_Cypress EXCLUDE_FROM_ALL)
11-
add_subdirectory(TARGET_Freescale EXCLUDE_FROM_ALL)
12-
add_subdirectory(TARGET_GigaDevice EXCLUDE_FROM_ALL)
13-
add_subdirectory(TARGET_Maxim EXCLUDE_FROM_ALL)
14-
add_subdirectory(TARGET_NORDIC EXCLUDE_FROM_ALL)
15-
add_subdirectory(TARGET_NUVOTON EXCLUDE_FROM_ALL)
16-
add_subdirectory(TARGET_NXP EXCLUDE_FROM_ALL)
17-
add_subdirectory(TARGET_RENESAS EXCLUDE_FROM_ALL)
18-
add_subdirectory(TARGET_Samsung EXCLUDE_FROM_ALL)
19-
add_subdirectory(TARGET_Silicon_Labs EXCLUDE_FROM_ALL)
20-
add_subdirectory(TARGET_STM EXCLUDE_FROM_ALL)
21-
add_subdirectory(TARGET_TOSHIBA EXCLUDE_FROM_ALL)
4+
if(${CMAKE_CROSSCOMPILING})
5+
include(mbed_set_linker_script)
6+
7+
add_subdirectory(TARGET_Ambiq_Micro EXCLUDE_FROM_ALL)
8+
add_subdirectory(TARGET_Analog_Devices EXCLUDE_FROM_ALL)
9+
add_subdirectory(TARGET_ARM_FM EXCLUDE_FROM_ALL)
10+
add_subdirectory(TARGET_ARM_SSG EXCLUDE_FROM_ALL)
11+
add_subdirectory(TARGET_Cypress EXCLUDE_FROM_ALL)
12+
add_subdirectory(TARGET_Freescale EXCLUDE_FROM_ALL)
13+
add_subdirectory(TARGET_GigaDevice EXCLUDE_FROM_ALL)
14+
add_subdirectory(TARGET_Maxim EXCLUDE_FROM_ALL)
15+
add_subdirectory(TARGET_NORDIC EXCLUDE_FROM_ALL)
16+
add_subdirectory(TARGET_NUVOTON EXCLUDE_FROM_ALL)
17+
add_subdirectory(TARGET_NXP EXCLUDE_FROM_ALL)
18+
add_subdirectory(TARGET_RENESAS EXCLUDE_FROM_ALL)
19+
add_subdirectory(TARGET_Samsung EXCLUDE_FROM_ALL)
20+
add_subdirectory(TARGET_Silicon_Labs EXCLUDE_FROM_ALL)
21+
add_subdirectory(TARGET_STM EXCLUDE_FROM_ALL)
22+
add_subdirectory(TARGET_TOSHIBA EXCLUDE_FROM_ALL)
23+
endif()

0 commit comments

Comments
 (0)