Skip to content

Commit 0909f6f

Browse files
0xc01700xc0170
authored
Merge pull request #13882 from hugueskamba/hk_cmake_use_relative_paths
CMake: Use relative paths to list source files and directories
2 parents afb3706 + 794e32d commit 0909f6f

File tree

79 files changed

+215
-220
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+215
-220
lines changed

‎CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55

66
cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
77

8-
# Using relative paths behavior
9-
if(POLICY CMP0076)
10-
cmake_policy(SET CMP0076 NEW)
11-
endif()
12-
138
include(${MBED_CONFIG_PATH}/mbed_config.cmake)
149
include(${MBED_PATH}/tools/cmake/core.cmake)
1510

‎connectivity/cellular/CMakeLists.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ add_subdirectory(source/framework)
55

66
target_include_directories(mbed-cellular
77
INTERFACE
8-
${CMAKE_CURRENT_SOURCE_DIR}
9-
${CMAKE_CURRENT_SOURCE_DIR}/include
10-
${CMAKE_CURRENT_SOURCE_DIR}/include/cellular
11-
${CMAKE_CURRENT_SOURCE_DIR}/include/cellular/framework
12-
${CMAKE_CURRENT_SOURCE_DIR}/include/cellular/framework/API
13-
${CMAKE_CURRENT_SOURCE_DIR}/include/cellular/framework/AT
14-
${CMAKE_CURRENT_SOURCE_DIR}/include/cellular/framework/common
15-
${CMAKE_CURRENT_SOURCE_DIR}/include/cellular/framework/device
8+
.
9+
./include
10+
./include/cellular
11+
./include/cellular/framework
12+
./include/cellular/framework/API
13+
./include/cellular/framework/AT
14+
./include/cellular/framework/common
15+
./include/cellular/framework/device
1616
)
1717

1818
target_compile_definitions(mbed-cellular

‎connectivity/drivers/802.15.4_RF/TARGET_Silicon_Labs/TARGET_SL_RAIL/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
target_include_directories(mbed-802.15.4-rf
55
INTERFACE
6-
${CMAKE_CURRENT_SOURCE_DIR}
6+
.
77
)
88

99
target_sources(mbed-802.15.4-rf

‎connectivity/drivers/cellular/MultiTech/DragonflyNano/PPP/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
target_include_directories(mbed-cellular
55
INTERFACE
6-
${CMAKE_CURRENT_SOURCE_DIR}
6+
.
77
)
88

99
target_sources(mbed-cellular

‎connectivity/drivers/cellular/QUECTEL/EC2X/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
target_include_directories(mbed-cellular
55
INTERFACE
6-
${CMAKE_CURRENT_SOURCE_DIR}
6+
.
77
)
88

99
target_sources(mbed-cellular

‎connectivity/drivers/cellular/TELIT/ME910/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
target_include_directories(mbed-cellular
55
INTERFACE
6-
${CMAKE_CURRENT_SOURCE_DIR}
6+
.
77
)
88

99
target_sources(mbed-cellular

‎connectivity/drivers/emac/TARGET_GD_EMAC/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ endif()
99

1010
target_include_directories(mbed-emac
1111
INTERFACE
12-
${CMAKE_CURRENT_SOURCE_DIR}
12+
.
1313
)
1414

1515
target_sources(mbed-emac

‎connectivity/drivers/emac/TARGET_RDA_EMAC/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ add_subdirectory(lwip-wifi)
55

66
target_include_directories(mbed-emac
77
INTERFACE
8-
${CMAKE_CURRENT_SOURCE_DIR}
8+
.
99
)
1010

1111
target_sources(mbed-emac

‎connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/binaries/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ function(_mbed_get_libcc_310_core)
1111
endif()
1212
target_link_libraries(mbed-mbedtls-cryptocell310
1313
INTERFACE
14-
${CMAKE_CURRENT_SOURCE_DIR}/${LIBCC_310_CORE}
14+
./${LIBCC_310_CORE}
1515
)
1616
endfunction()
1717

‎connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/TARGET_NUMAKER_PFM_NUC472/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33

44
target_include_directories(mbed-mbedtls
55
INTERFACE
6-
${CMAKE_CURRENT_SOURCE_DIR}
6+
.
77
)

‎connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32F437xG/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33

44
target_include_directories(mbed-mbedtls-stm
55
INTERFACE
6-
${CMAKE_CURRENT_SOURCE_DIR}
6+
.
77
)

‎connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32F756xG/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33

44
target_include_directories(mbed-mbedtls-stm
55
INTERFACE
6-
${CMAKE_CURRENT_SOURCE_DIR}
6+
.
77
)

‎connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L443xC/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33

44
target_include_directories(mbed-mbedtls-stm
55
INTERFACE
6-
${CMAKE_CURRENT_SOURCE_DIR}
6+
.
77
)

‎connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L486xG/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33

44
target_include_directories(mbed-mbedtls-stm
55
INTERFACE
6-
${CMAKE_CURRENT_SOURCE_DIR}
6+
.
77
)

‎connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L562xx/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33

44
target_include_directories(mbed-mbedtls-stm
55
INTERFACE
6-
${CMAKE_CURRENT_SOURCE_DIR}
6+
.
77
)

‎connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32WB55xx/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33

44
target_include_directories(mbed-mbedtls-stm
55
INTERFACE
6-
${CMAKE_CURRENT_SOURCE_DIR}
6+
.
77
)

‎connectivity/drivers/nfc/PN512/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
target_include_directories(mbed-nfc
55
INTERFACE
6-
${CMAKE_CURRENT_SOURCE_DIR}/include
7-
${CMAKE_CURRENT_SOURCE_DIR}/include/nfc
8-
${CMAKE_CURRENT_SOURCE_DIR}/include/nfc/controllers
9-
${CMAKE_CURRENT_SOURCE_DIR}/source
10-
${CMAKE_CURRENT_SOURCE_DIR}/source/transceiver
6+
./include
7+
./include/nfc
8+
./include/nfc/controllers
9+
./source
10+
./source/transceiver
1111
)
1212

1313
target_sources(mbed-nfc

‎connectivity/lorawan/lorastack/CMakeLists.txt

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

44
target_include_directories(mbed-lorawan
55
INTERFACE
6-
${CMAKE_CURRENT_SOURCE_DIR}
7-
${CMAKE_CURRENT_SOURCE_DIR}/mac
8-
${CMAKE_CURRENT_SOURCE_DIR}/phy
6+
.
7+
./mac
8+
./phy
99
)
1010

1111
target_sources(mbed-lorawan

‎connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/CMakeLists.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33

44
target_include_directories(mbed-nanostack-sal_stack
55
INTERFACE
6-
${CMAKE_CURRENT_SOURCE_DIR}
7-
${CMAKE_CURRENT_SOURCE_DIR}/Bootstraps
8-
${CMAKE_CURRENT_SOURCE_DIR}/Fragmentation
9-
${CMAKE_CURRENT_SOURCE_DIR}/IPHC_Decode
10-
${CMAKE_CURRENT_SOURCE_DIR}/MAC
11-
${CMAKE_CURRENT_SOURCE_DIR}/Mesh
12-
${CMAKE_CURRENT_SOURCE_DIR}/ND
13-
${CMAKE_CURRENT_SOURCE_DIR}/NVM
14-
${CMAKE_CURRENT_SOURCE_DIR}/Thread
15-
${CMAKE_CURRENT_SOURCE_DIR}/ws
6+
.
7+
./Bootstraps
8+
./Fragmentation
9+
./IPHC_Decode
10+
./MAC
11+
./Mesh
12+
./ND
13+
./NVM
14+
./Thread
15+
./ws
1616
)
1717

1818
target_sources(mbed-nanostack-sal_stack

‎connectivity/nanostack/sal-stack-nanostack/source/BorderRouter/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
target_include_directories(mbed-nanostack-sal_stack
55
INTERFACE
6-
${CMAKE_CURRENT_SOURCE_DIR}
6+
.
77
)
88

99
target_sources(mbed-nanostack-sal_stack

‎connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
target_include_directories(mbed-nanostack-sal_stack
55
INTERFACE
6-
${CMAKE_CURRENT_SOURCE_DIR}
6+
.
77
)
88

99
target_sources(mbed-nanostack-sal_stack

‎connectivity/nanostack/sal-stack-nanostack/source/Core/CMakeLists.txt

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

44
target_include_directories(mbed-nanostack-sal_stack
55
INTERFACE
6-
${CMAKE_CURRENT_SOURCE_DIR}
7-
${CMAKE_CURRENT_SOURCE_DIR}/include
6+
.
7+
./include
88
)
99

1010
target_sources(mbed-nanostack-sal_stack

‎connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_Server/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
target_include_directories(mbed-nanostack-sal_stack
55
INTERFACE
6-
${CMAKE_CURRENT_SOURCE_DIR}
6+
.
77
)
88

99
target_sources(mbed-nanostack-sal_stack

‎connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_client/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
target_include_directories(mbed-nanostack-sal_stack
55
INTERFACE
6-
${CMAKE_CURRENT_SOURCE_DIR}
6+
.
77
)
88

99
target_sources(mbed-nanostack-sal_stack

‎connectivity/nanostack/sal-stack-nanostack/source/MAC/CMakeLists.txt

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

44
target_include_directories(mbed-nanostack-sal_stack
55
INTERFACE
6-
${CMAKE_CURRENT_SOURCE_DIR}
7-
${CMAKE_CURRENT_SOURCE_DIR}/IEEE802_15_4
8-
${CMAKE_CURRENT_SOURCE_DIR}/virtual_rf
6+
.
7+
./IEEE802_15_4
8+
./virtual_rf
99
)
1010

1111
target_sources(mbed-nanostack-sal_stack

‎connectivity/nanostack/sal-stack-nanostack/source/MLE/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
target_include_directories(mbed-nanostack-sal_stack
55
INTERFACE
6-
${CMAKE_CURRENT_SOURCE_DIR}
6+
.
77
)
88

99
target_sources(mbed-nanostack-sal_stack

‎connectivity/nanostack/sal-stack-nanostack/source/MPL/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
target_include_directories(mbed-nanostack-sal_stack
55
INTERFACE
6-
${CMAKE_CURRENT_SOURCE_DIR}
6+
.
77
)
88

99
target_sources(mbed-nanostack-sal_stack

‎connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/CMakeLists.txt

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

44
target_include_directories(mbed-nanostack-sal_stack
55
INTERFACE
6-
${CMAKE_CURRENT_SOURCE_DIR}
7-
${CMAKE_CURRENT_SOURCE_DIR}/Include
6+
.
7+
./Include
88
)
99

1010
target_sources(mbed-nanostack-sal_stack

‎connectivity/nanostack/sal-stack-nanostack/source/RPL/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
target_include_directories(mbed-nanostack-sal_stack
55
INTERFACE
6-
${CMAKE_CURRENT_SOURCE_DIR}
6+
.
77
)
88

99
target_sources(mbed-nanostack-sal_stack

‎connectivity/nanostack/sal-stack-nanostack/source/Security/CMakeLists.txt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33

44
target_include_directories(mbed-nanostack-sal_stack
55
INTERFACE
6-
${CMAKE_CURRENT_SOURCE_DIR}
7-
${CMAKE_CURRENT_SOURCE_DIR}/Common
8-
${CMAKE_CURRENT_SOURCE_DIR}/PANA
9-
${CMAKE_CURRENT_SOURCE_DIR}/TLS
10-
${CMAKE_CURRENT_SOURCE_DIR}/eapol
11-
${CMAKE_CURRENT_SOURCE_DIR}/kmp
12-
${CMAKE_CURRENT_SOURCE_DIR}/protocols
13-
${CMAKE_CURRENT_SOURCE_DIR}/protocols/eap_tls_sec_prot
14-
${CMAKE_CURRENT_SOURCE_DIR}/protocols/fwh_sec_prot
15-
${CMAKE_CURRENT_SOURCE_DIR}/protocols/gkh_sec_prot
16-
${CMAKE_CURRENT_SOURCE_DIR}/protocols/key_sec_prot
17-
${CMAKE_CURRENT_SOURCE_DIR}/protocols/radius_sec_prot
18-
${CMAKE_CURRENT_SOURCE_DIR}/protocols/tls_sec_prot
6+
.
7+
./Common
8+
./PANA
9+
./TLS
10+
./eapol
11+
./kmp
12+
./protocols
13+
./protocols/eap_tls_sec_prot
14+
./protocols/fwh_sec_prot
15+
./protocols/gkh_sec_prot
16+
./protocols/key_sec_prot
17+
./protocols/radius_sec_prot
18+
./protocols/tls_sec_prot
1919
)
2020

2121
target_sources(mbed-nanostack-sal_stack

‎connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/CMakeLists.txt

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,35 @@
33

44
target_include_directories(mbed-nanostack-sal_stack
55
INTERFACE
6-
${CMAKE_CURRENT_SOURCE_DIR}
7-
${CMAKE_CURRENT_SOURCE_DIR}/Neighbor_cache
8-
${CMAKE_CURRENT_SOURCE_DIR}/Trickle
9-
${CMAKE_CURRENT_SOURCE_DIR}/blacklist
10-
${CMAKE_CURRENT_SOURCE_DIR}/etx
11-
${CMAKE_CURRENT_SOURCE_DIR}/fhss
12-
${CMAKE_CURRENT_SOURCE_DIR}/fnv_hash
13-
${CMAKE_CURRENT_SOURCE_DIR}/hmac
14-
${CMAKE_CURRENT_SOURCE_DIR}/ieee_802_11
15-
${CMAKE_CURRENT_SOURCE_DIR}/load_balance
16-
${CMAKE_CURRENT_SOURCE_DIR}/mac_neighbor_table
17-
${CMAKE_CURRENT_SOURCE_DIR}/mdns
18-
${CMAKE_CURRENT_SOURCE_DIR}/mdns/fnet
19-
${CMAKE_CURRENT_SOURCE_DIR}/mdns/fnet/fnet_stack
20-
${CMAKE_CURRENT_SOURCE_DIR}/mdns/fnet/fnet_stack/port
21-
${CMAKE_CURRENT_SOURCE_DIR}/mdns/fnet/fnet_stack/port/compiler
22-
${CMAKE_CURRENT_SOURCE_DIR}/mdns/fnet/fnet_stack/port/cpu
23-
${CMAKE_CURRENT_SOURCE_DIR}/mdns/fnet/fnet_stack/services
24-
${CMAKE_CURRENT_SOURCE_DIR}/mdns/fnet/fnet_stack/services/dns
25-
${CMAKE_CURRENT_SOURCE_DIR}/mdns/fnet/fnet_stack/services/mdns
26-
${CMAKE_CURRENT_SOURCE_DIR}/mdns/fnet/fnet_stack/services/poll
27-
${CMAKE_CURRENT_SOURCE_DIR}/mdns/fnet/fnet_stack/services/serial
28-
${CMAKE_CURRENT_SOURCE_DIR}/mdns/fnet/fnet_stack/stack
29-
${CMAKE_CURRENT_SOURCE_DIR}/mle_service
30-
${CMAKE_CURRENT_SOURCE_DIR}/nd_proxy
31-
${CMAKE_CURRENT_SOURCE_DIR}/nist_aes_kw
32-
${CMAKE_CURRENT_SOURCE_DIR}/pan_blacklist
33-
${CMAKE_CURRENT_SOURCE_DIR}/utils
34-
${CMAKE_CURRENT_SOURCE_DIR}/whiteboard
6+
.
7+
./Neighbor_cache
8+
./Trickle
9+
./blacklist
10+
./etx
11+
./fhss
12+
./fnv_hash
13+
./hmac
14+
./ieee_802_11
15+
./load_balance
16+
./mac_neighbor_table
17+
./mdns
18+
./mdns/fnet
19+
./mdns/fnet/fnet_stack
20+
./mdns/fnet/fnet_stack/port
21+
./mdns/fnet/fnet_stack/port/compiler
22+
./mdns/fnet/fnet_stack/port/cpu
23+
./mdns/fnet/fnet_stack/services
24+
./mdns/fnet/fnet_stack/services/dns
25+
./mdns/fnet/fnet_stack/services/mdns
26+
./mdns/fnet/fnet_stack/services/poll
27+
./mdns/fnet/fnet_stack/services/serial
28+
./mdns/fnet/fnet_stack/stack
29+
./mle_service
30+
./nd_proxy
31+
./nist_aes_kw
32+
./pan_blacklist
33+
./utils
34+
./whiteboard
3535
)
3636

3737
target_sources(mbed-nanostack-sal_stack

0 commit comments

Comments
 (0)