CMake: Use relative paths to list source files and directories

The absolute path is still required for listing linker files as they are referenced from a function in the top level CMake input source file.
lhespress · Nov 9, 2020 · 794e32d · 794e32d
1 parent 22d926f
commit 794e32d
Show file tree

Hide file tree

Showing 79 changed files with 215 additions and 220 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,11 +5,6 @@
 
 cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
 
-# Using relative paths behavior
-if(POLICY CMP0076)
-    cmake_policy(SET CMP0076 NEW)
-endif()
-
 include(${MBED_CONFIG_PATH}/mbed_config.cmake)
 include(${MBED_PATH}/tools/cmake/core.cmake)
 

diff --git a/connectivity/cellular/CMakeLists.txt b/connectivity/cellular/CMakeLists.txt
@@ -5,14 +5,14 @@ add_subdirectory(source/framework)
 
 target_include_directories(mbed-cellular
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/include
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/cellular
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/cellular/framework
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/cellular/framework/API
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/cellular/framework/AT
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/cellular/framework/common
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/cellular/framework/device
+        .
+        ./include
+        ./include/cellular
+        ./include/cellular/framework
+        ./include/cellular/framework/API
+        ./include/cellular/framework/AT
+        ./include/cellular/framework/common
+        ./include/cellular/framework/device
 )
 
 target_compile_definitions(mbed-cellular

diff --git a/connectivity/drivers/802.15.4_RF/TARGET_Silicon_Labs/TARGET_SL_RAIL/CMakeLists.txt b/connectivity/drivers/802.15.4_RF/TARGET_Silicon_Labs/TARGET_SL_RAIL/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 target_include_directories(mbed-802.15.4-rf
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
+        .
 )
 
 target_sources(mbed-802.15.4-rf

diff --git a/connectivity/drivers/cellular/MultiTech/DragonflyNano/PPP/CMakeLists.txt b/connectivity/drivers/cellular/MultiTech/DragonflyNano/PPP/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 target_include_directories(mbed-cellular
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
+        .
 )
 
 target_sources(mbed-cellular

diff --git a/connectivity/drivers/cellular/QUECTEL/EC2X/CMakeLists.txt b/connectivity/drivers/cellular/QUECTEL/EC2X/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 target_include_directories(mbed-cellular
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
+        .
 )
 
 target_sources(mbed-cellular

diff --git a/connectivity/drivers/cellular/TELIT/ME910/CMakeLists.txt b/connectivity/drivers/cellular/TELIT/ME910/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 target_include_directories(mbed-cellular
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
+        .
 )
 
 target_sources(mbed-cellular

diff --git a/connectivity/drivers/emac/TARGET_GD_EMAC/CMakeLists.txt b/connectivity/drivers/emac/TARGET_GD_EMAC/CMakeLists.txt
@@ -9,7 +9,7 @@ endif()
 
 target_include_directories(mbed-emac
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
+        .
 )
 
 target_sources(mbed-emac

diff --git a/connectivity/drivers/emac/TARGET_RDA_EMAC/CMakeLists.txt b/connectivity/drivers/emac/TARGET_RDA_EMAC/CMakeLists.txt
@@ -5,7 +5,7 @@ add_subdirectory(lwip-wifi)
 
 target_include_directories(mbed-emac
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
+        .
 )
 
 target_sources(mbed-emac

diff --git a/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/binaries/CMakeLists.txt b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/binaries/CMakeLists.txt
@@ -11,7 +11,7 @@ function(_mbed_get_libcc_310_core)
     endif()
     target_link_libraries(mbed-mbedtls-cryptocell310
         INTERFACE
-            ${CMAKE_CURRENT_SOURCE_DIR}/${LIBCC_310_CORE}
+            ./${LIBCC_310_CORE}
     )
 endfunction()
 

diff --git a/...ity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/TARGET_NUMAKER_PFM_NUC472/CMakeLists.txt b/...ity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/TARGET_NUMAKER_PFM_NUC472/CMakeLists.txt
@@ -3,5 +3,5 @@
 
 target_include_directories(mbed-mbedtls
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
+        .
 )
diff --git a/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32F437xG/CMakeLists.txt b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32F437xG/CMakeLists.txt
@@ -3,5 +3,5 @@
 
 target_include_directories(mbed-mbedtls-stm
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
+        .
 )
diff --git a/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32F756xG/CMakeLists.txt b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32F756xG/CMakeLists.txt
@@ -3,5 +3,5 @@
 
 target_include_directories(mbed-mbedtls-stm
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
+        .
 )
diff --git a/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L443xC/CMakeLists.txt b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L443xC/CMakeLists.txt
@@ -3,5 +3,5 @@
 
 target_include_directories(mbed-mbedtls-stm
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
+        .
 )
diff --git a/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L486xG/CMakeLists.txt b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L486xG/CMakeLists.txt
@@ -3,5 +3,5 @@
 
 target_include_directories(mbed-mbedtls-stm
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
+        .
 )
diff --git a/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L562xx/CMakeLists.txt b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L562xx/CMakeLists.txt
@@ -3,5 +3,5 @@
 
 target_include_directories(mbed-mbedtls-stm
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
+        .
 )
diff --git a/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32WB55xx/CMakeLists.txt b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32WB55xx/CMakeLists.txt
@@ -3,5 +3,5 @@
 
 target_include_directories(mbed-mbedtls-stm
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
+        .
 )
diff --git a/connectivity/drivers/nfc/PN512/CMakeLists.txt b/connectivity/drivers/nfc/PN512/CMakeLists.txt
@@ -3,11 +3,11 @@
 
 target_include_directories(mbed-nfc
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}/include
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/nfc
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/nfc/controllers
-        ${CMAKE_CURRENT_SOURCE_DIR}/source
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/transceiver
+        ./include
+        ./include/nfc
+        ./include/nfc/controllers
+        ./source
+        ./source/transceiver
 )
 
 target_sources(mbed-nfc

diff --git a/connectivity/lorawan/lorastack/CMakeLists.txt b/connectivity/lorawan/lorastack/CMakeLists.txt
@@ -3,9 +3,9 @@
 
 target_include_directories(mbed-lorawan
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/mac
-        ${CMAKE_CURRENT_SOURCE_DIR}/phy
+        .
+        ./mac
+        ./phy
 )
 
 target_sources(mbed-lorawan

diff --git a/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/CMakeLists.txt
@@ -3,16 +3,16 @@
 
 target_include_directories(mbed-nanostack-sal_stack
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/Bootstraps
-        ${CMAKE_CURRENT_SOURCE_DIR}/Fragmentation
-        ${CMAKE_CURRENT_SOURCE_DIR}/IPHC_Decode
-        ${CMAKE_CURRENT_SOURCE_DIR}/MAC
-        ${CMAKE_CURRENT_SOURCE_DIR}/Mesh
-        ${CMAKE_CURRENT_SOURCE_DIR}/ND
-        ${CMAKE_CURRENT_SOURCE_DIR}/NVM
-        ${CMAKE_CURRENT_SOURCE_DIR}/Thread
-        ${CMAKE_CURRENT_SOURCE_DIR}/ws
+        .
+        ./Bootstraps
+        ./Fragmentation
+        ./IPHC_Decode
+        ./MAC
+        ./Mesh
+        ./ND
+        ./NVM
+        ./Thread
+        ./ws
 )
 
 target_sources(mbed-nanostack-sal_stack

diff --git a/connectivity/nanostack/sal-stack-nanostack/source/BorderRouter/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/BorderRouter/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 target_include_directories(mbed-nanostack-sal_stack
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
+        .
 )
 
 target_sources(mbed-nanostack-sal_stack

diff --git a/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 target_include_directories(mbed-nanostack-sal_stack
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
+        .
 )
 
 target_sources(mbed-nanostack-sal_stack

diff --git a/connectivity/nanostack/sal-stack-nanostack/source/Core/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/Core/CMakeLists.txt
@@ -3,8 +3,8 @@
 
 target_include_directories(mbed-nanostack-sal_stack
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/include
+        .
+        ./include
 )
 
 target_sources(mbed-nanostack-sal_stack

diff --git a/connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_Server/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_Server/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 target_include_directories(mbed-nanostack-sal_stack
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
+        .
 )
 
 target_sources(mbed-nanostack-sal_stack

diff --git a/connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_client/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_client/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 target_include_directories(mbed-nanostack-sal_stack
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
+        .
 )
 
 target_sources(mbed-nanostack-sal_stack

diff --git a/connectivity/nanostack/sal-stack-nanostack/source/MAC/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/MAC/CMakeLists.txt
@@ -3,9 +3,9 @@
 
 target_include_directories(mbed-nanostack-sal_stack
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/IEEE802_15_4
-        ${CMAKE_CURRENT_SOURCE_DIR}/virtual_rf
+        .
+        ./IEEE802_15_4
+        ./virtual_rf
 )
 
 target_sources(mbed-nanostack-sal_stack

diff --git a/connectivity/nanostack/sal-stack-nanostack/source/MLE/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/MLE/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 target_include_directories(mbed-nanostack-sal_stack
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
+        .
 )
 
 target_sources(mbed-nanostack-sal_stack

diff --git a/connectivity/nanostack/sal-stack-nanostack/source/MPL/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/MPL/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 target_include_directories(mbed-nanostack-sal_stack
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
+        .
 )
 
 target_sources(mbed-nanostack-sal_stack

diff --git a/connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/CMakeLists.txt
@@ -3,8 +3,8 @@
 
 target_include_directories(mbed-nanostack-sal_stack
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/Include
+        .
+        ./Include
 )
 
 target_sources(mbed-nanostack-sal_stack

diff --git a/connectivity/nanostack/sal-stack-nanostack/source/RPL/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/RPL/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 target_include_directories(mbed-nanostack-sal_stack
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
+        .
 )
 
 target_sources(mbed-nanostack-sal_stack

diff --git a/connectivity/nanostack/sal-stack-nanostack/source/Security/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/Security/CMakeLists.txt
@@ -3,19 +3,19 @@
 
 target_include_directories(mbed-nanostack-sal_stack
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/Common
-        ${CMAKE_CURRENT_SOURCE_DIR}/PANA
-        ${CMAKE_CURRENT_SOURCE_DIR}/TLS
-        ${CMAKE_CURRENT_SOURCE_DIR}/eapol
-        ${CMAKE_CURRENT_SOURCE_DIR}/kmp
-        ${CMAKE_CURRENT_SOURCE_DIR}/protocols
-        ${CMAKE_CURRENT_SOURCE_DIR}/protocols/eap_tls_sec_prot
-        ${CMAKE_CURRENT_SOURCE_DIR}/protocols/fwh_sec_prot
-        ${CMAKE_CURRENT_SOURCE_DIR}/protocols/gkh_sec_prot
-        ${CMAKE_CURRENT_SOURCE_DIR}/protocols/key_sec_prot
-        ${CMAKE_CURRENT_SOURCE_DIR}/protocols/radius_sec_prot
-        ${CMAKE_CURRENT_SOURCE_DIR}/protocols/tls_sec_prot
+        .
+        ./Common
+        ./PANA
+        ./TLS
+        ./eapol
+        ./kmp
+        ./protocols
+        ./protocols/eap_tls_sec_prot
+        ./protocols/fwh_sec_prot
+        ./protocols/gkh_sec_prot
+        ./protocols/key_sec_prot
+        ./protocols/radius_sec_prot
+        ./protocols/tls_sec_prot
 )
 
 target_sources(mbed-nanostack-sal_stack

diff --git a/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/CMakeLists.txt
@@ -3,35 +3,35 @@
 
 target_include_directories(mbed-nanostack-sal_stack
     INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/Neighbor_cache
-        ${CMAKE_CURRENT_SOURCE_DIR}/Trickle
-        ${CMAKE_CURRENT_SOURCE_DIR}/blacklist
-        ${CMAKE_CURRENT_SOURCE_DIR}/etx
-        ${CMAKE_CURRENT_SOURCE_DIR}/fhss
-        ${CMAKE_CURRENT_SOURCE_DIR}/fnv_hash
-        ${CMAKE_CURRENT_SOURCE_DIR}/hmac
-        ${CMAKE_CURRENT_SOURCE_DIR}/ieee_802_11
-        ${CMAKE_CURRENT_SOURCE_DIR}/load_balance
-        ${CMAKE_CURRENT_SOURCE_DIR}/mac_neighbor_table
-        ${CMAKE_CURRENT_SOURCE_DIR}/mdns
-        ${CMAKE_CURRENT_SOURCE_DIR}/mdns/fnet
-        ${CMAKE_CURRENT_SOURCE_DIR}/mdns/fnet/fnet_stack
-        ${CMAKE_CURRENT_SOURCE_DIR}/mdns/fnet/fnet_stack/port
-        ${CMAKE_CURRENT_SOURCE_DIR}/mdns/fnet/fnet_stack/port/compiler
-        ${CMAKE_CURRENT_SOURCE_DIR}/mdns/fnet/fnet_stack/port/cpu
-        ${CMAKE_CURRENT_SOURCE_DIR}/mdns/fnet/fnet_stack/services
-        ${CMAKE_CURRENT_SOURCE_DIR}/mdns/fnet/fnet_stack/services/dns
-        ${CMAKE_CURRENT_SOURCE_DIR}/mdns/fnet/fnet_stack/services/mdns
-        ${CMAKE_CURRENT_SOURCE_DIR}/mdns/fnet/fnet_stack/services/poll
-        ${CMAKE_CURRENT_SOURCE_DIR}/mdns/fnet/fnet_stack/services/serial
-        ${CMAKE_CURRENT_SOURCE_DIR}/mdns/fnet/fnet_stack/stack
-        ${CMAKE_CURRENT_SOURCE_DIR}/mle_service
-        ${CMAKE_CURRENT_SOURCE_DIR}/nd_proxy
-        ${CMAKE_CURRENT_SOURCE_DIR}/nist_aes_kw
-        ${CMAKE_CURRENT_SOURCE_DIR}/pan_blacklist
-        ${CMAKE_CURRENT_SOURCE_DIR}/utils
-        ${CMAKE_CURRENT_SOURCE_DIR}/whiteboard
+        .
+        ./Neighbor_cache
+        ./Trickle
+        ./blacklist
+        ./etx
+        ./fhss
+        ./fnv_hash
+        ./hmac
+        ./ieee_802_11
+        ./load_balance
+        ./mac_neighbor_table
+        ./mdns
+        ./mdns/fnet
+        ./mdns/fnet/fnet_stack
+        ./mdns/fnet/fnet_stack/port
+        ./mdns/fnet/fnet_stack/port/compiler
+        ./mdns/fnet/fnet_stack/port/cpu
+        ./mdns/fnet/fnet_stack/services
+        ./mdns/fnet/fnet_stack/services/dns
+        ./mdns/fnet/fnet_stack/services/mdns
+        ./mdns/fnet/fnet_stack/services/poll
+        ./mdns/fnet/fnet_stack/services/serial
+        ./mdns/fnet/fnet_stack/stack
+        ./mle_service
+        ./nd_proxy
+        ./nist_aes_kw
+        ./pan_blacklist
+        ./utils
+        ./whiteboard
 )
 
 target_sources(mbed-nanostack-sal_stack