Skip to content

CMake: Use relative paths to list source files and directories #13882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 11, 2020
Merged

CMake: Use relative paths to list source files and directories #13882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
16 changes: 8 additions & 8 deletions connectivity/cellular/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion connectivity/drivers/802.15.4_RF/TARGET_Silicon_Labs/TARGET_SL_RAIL/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

target_include_directories(mbed-802.15.4-rf
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}
.
)

target_sources(mbed-802.15.4-rf
Expand Down
2 changes: 1 addition & 1 deletion connectivity/drivers/cellular/MultiTech/DragonflyNano/PPP/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

target_include_directories(mbed-cellular
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}
.
)

target_sources(mbed-cellular
Expand Down
2 changes: 1 addition & 1 deletion connectivity/drivers/cellular/QUECTEL/EC2X/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

target_include_directories(mbed-cellular
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}
.
)

target_sources(mbed-cellular
Expand Down
2 changes: 1 addition & 1 deletion connectivity/drivers/cellular/TELIT/ME910/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

target_include_directories(mbed-cellular
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}
.
)

target_sources(mbed-cellular
Expand Down
2 changes: 1 addition & 1 deletion connectivity/drivers/emac/TARGET_GD_EMAC/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ endif()

target_include_directories(mbed-emac
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}
.
)

target_sources(mbed-emac
Expand Down
2 changes: 1 addition & 1 deletion connectivity/drivers/emac/TARGET_RDA_EMAC/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ add_subdirectory(lwip-wifi)

target_include_directories(mbed-emac
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}
.
)

target_sources(mbed-emac
Expand Down
2 changes: 1 addition & 1 deletion connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/binaries/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion ...ity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/TARGET_NUMAKER_PFM_NUC472/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@

target_include_directories(mbed-mbedtls
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}
.
)
2 changes: 1 addition & 1 deletion connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32F437xG/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@

target_include_directories(mbed-mbedtls-stm
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}
.
)
2 changes: 1 addition & 1 deletion connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32F756xG/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@

target_include_directories(mbed-mbedtls-stm
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}
.
)
2 changes: 1 addition & 1 deletion connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L443xC/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@

target_include_directories(mbed-mbedtls-stm
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}
.
)
2 changes: 1 addition & 1 deletion connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L486xG/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@

target_include_directories(mbed-mbedtls-stm
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}
.
)
2 changes: 1 addition & 1 deletion connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L562xx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@

target_include_directories(mbed-mbedtls-stm
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}
.
)
2 changes: 1 addition & 1 deletion connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32WB55xx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@

target_include_directories(mbed-mbedtls-stm
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}
.
)
10 changes: 5 additions & 5 deletions connectivity/drivers/nfc/PN512/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions connectivity/lorawan/lorastack/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 10 additions & 10 deletions connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion connectivity/nanostack/sal-stack-nanostack/source/BorderRouter/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

target_include_directories(mbed-nanostack-sal_stack
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}
.
)

target_sources(mbed-nanostack-sal_stack
Expand Down
2 changes: 1 addition & 1 deletion connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

target_include_directories(mbed-nanostack-sal_stack
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}
.
)

target_sources(mbed-nanostack-sal_stack
Expand Down
4 changes: 2 additions & 2 deletions connectivity/nanostack/sal-stack-nanostack/source/Core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_Server/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

target_include_directories(mbed-nanostack-sal_stack
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}
.
)

target_sources(mbed-nanostack-sal_stack
Expand Down
2 changes: 1 addition & 1 deletion connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_client/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

target_include_directories(mbed-nanostack-sal_stack
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}
.
)

target_sources(mbed-nanostack-sal_stack
Expand Down
6 changes: 3 additions & 3 deletions connectivity/nanostack/sal-stack-nanostack/source/MAC/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion connectivity/nanostack/sal-stack-nanostack/source/MLE/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

target_include_directories(mbed-nanostack-sal_stack
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}
.
)

target_sources(mbed-nanostack-sal_stack
Expand Down
2 changes: 1 addition & 1 deletion connectivity/nanostack/sal-stack-nanostack/source/MPL/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

target_include_directories(mbed-nanostack-sal_stack
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}
.
)

target_sources(mbed-nanostack-sal_stack
Expand Down
4 changes: 2 additions & 2 deletions connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion connectivity/nanostack/sal-stack-nanostack/source/RPL/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

target_include_directories(mbed-nanostack-sal_stack
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}
.
)

target_sources(mbed-nanostack-sal_stack
Expand Down
26 changes: 13 additions & 13 deletions connectivity/nanostack/sal-stack-nanostack/source/Security/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
58 changes: 29 additions & 29 deletions connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading