diff --git a/drivers/console/CMakeLists.txt b/drivers/console/CMakeLists.txt index 7e71e33414c..f4875ae4cbc 100644 --- a/drivers/console/CMakeLists.txt +++ b/drivers/console/CMakeLists.txt @@ -4,7 +4,7 @@ zephyr_library() if (${CONFIG_BSIM_CONSOLE}) zephyr_library_sources(bsim_console.c) - zephyr_library_include_directories($ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/) + zephyr_library_include_directories(${BSIM_COMPONENTS_PATH}/libUtilv1/src/) endif() zephyr_library_sources_ifdef(CONFIG_GSM_MUX gsm_mux.c) diff --git a/tests/bsim/bluetooth/audio/CMakeLists.txt b/tests/bsim/bluetooth/audio/CMakeLists.txt index 21d89d3427b..87606dbc5c3 100644 --- a/tests/bsim/bluetooth/audio/CMakeLists.txt +++ b/tests/bsim/bluetooth/audio/CMakeLists.txt @@ -9,7 +9,7 @@ FILE(GLOB app_sources src/*.c) target_sources(app PRIVATE ${app_sources} ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${ZEPHYR_BASE}/subsys/bluetooth/host/audio/ ) diff --git a/tests/bsim/bluetooth/host/adv/chain/CMakeLists.txt b/tests/bsim/bluetooth/host/adv/chain/CMakeLists.txt index 97a4f839022..032cd1d68bc 100644 --- a/tests/bsim/bluetooth/host/adv/chain/CMakeLists.txt +++ b/tests/bsim/bluetooth/host/adv/chain/CMakeLists.txt @@ -12,6 +12,6 @@ target_sources(app PRIVATE ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) diff --git a/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/CMakeLists.txt b/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/CMakeLists.txt index 29bd466d864..5a644c12fe1 100644 --- a/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/CMakeLists.txt +++ b/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/CMakeLists.txt @@ -13,6 +13,6 @@ target_sources(app PRIVATE ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) diff --git a/tests/bsim/bluetooth/host/adv/encrypted/ead_sample/CMakeLists.txt b/tests/bsim/bluetooth/host/adv/encrypted/ead_sample/CMakeLists.txt index c3b140dd6d3..436eff05d4a 100644 --- a/tests/bsim/bluetooth/host/adv/encrypted/ead_sample/CMakeLists.txt +++ b/tests/bsim/bluetooth/host/adv/encrypted/ead_sample/CMakeLists.txt @@ -12,8 +12,8 @@ target_sources(app PRIVATE ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${ZEPHYR_BASE}/samples/bluetooth/encrypted_advertising/peripheral/src/ ${ZEPHYR_BASE}/samples/bluetooth/encrypted_advertising/include/ diff --git a/tests/bsim/bluetooth/host/adv/periodic/CMakeLists.txt b/tests/bsim/bluetooth/host/adv/periodic/CMakeLists.txt index cab8c82df99..ebf037dffce 100644 --- a/tests/bsim/bluetooth/host/adv/periodic/CMakeLists.txt +++ b/tests/bsim/bluetooth/host/adv/periodic/CMakeLists.txt @@ -13,7 +13,7 @@ target_sources(app PRIVATE ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${ZEPHYR_BASE}/subsys/bluetooth/host/audio/ ) diff --git a/tests/bsim/bluetooth/host/adv/resume/CMakeLists.txt b/tests/bsim/bluetooth/host/adv/resume/CMakeLists.txt index a5db8a3a600..b327d787944 100644 --- a/tests/bsim/bluetooth/host/adv/resume/CMakeLists.txt +++ b/tests/bsim/bluetooth/host/adv/resume/CMakeLists.txt @@ -13,6 +13,6 @@ target_sources(app PRIVATE ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) diff --git a/tests/bsim/bluetooth/host/att/eatt/CMakeLists.txt b/tests/bsim/bluetooth/host/att/eatt/CMakeLists.txt index 1ca1a5fb110..680fc7120c2 100644 --- a/tests/bsim/bluetooth/host/att/eatt/CMakeLists.txt +++ b/tests/bsim/bluetooth/host/att/eatt/CMakeLists.txt @@ -16,6 +16,6 @@ target_sources(app PRIVATE zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) diff --git a/tests/bsim/bluetooth/host/att/eatt_notif/CMakeLists.txt b/tests/bsim/bluetooth/host/att/eatt_notif/CMakeLists.txt index 5376cda3894..202f757b3b7 100644 --- a/tests/bsim/bluetooth/host/att/eatt_notif/CMakeLists.txt +++ b/tests/bsim/bluetooth/host/att/eatt_notif/CMakeLists.txt @@ -9,6 +9,6 @@ FILE(GLOB app_sources src/*.c) target_sources(app PRIVATE ${app_sources} ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) diff --git a/tests/bsim/bluetooth/host/att/mtu_update/CMakeLists.txt b/tests/bsim/bluetooth/host/att/mtu_update/CMakeLists.txt index 9be2c308971..575b0412e07 100644 --- a/tests/bsim/bluetooth/host/att/mtu_update/CMakeLists.txt +++ b/tests/bsim/bluetooth/host/att/mtu_update/CMakeLists.txt @@ -12,6 +12,6 @@ target_sources(app PRIVATE ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) diff --git a/tests/bsim/bluetooth/host/att/read_fill_buf/client/CMakeLists.txt b/tests/bsim/bluetooth/host/att/read_fill_buf/client/CMakeLists.txt index b14837b7000..9c4968f0a09 100644 --- a/tests/bsim/bluetooth/host/att/read_fill_buf/client/CMakeLists.txt +++ b/tests/bsim/bluetooth/host/att/read_fill_buf/client/CMakeLists.txt @@ -2,13 +2,6 @@ cmake_minimum_required(VERSION 3.20.0) -if(NOT DEFINED ENV{BSIM_COMPONENTS_PATH}) - message(FATAL_ERROR "This test requires the BabbleSim simulator. Please set\ - the environment variable BSIM_COMPONENTS_PATH to point to its components \ - folder. More information can be found in\ - https://babblesim.github.io/folder_structure_and_env.html") -endif() - find_package(Zephyr HINTS $ENV{ZEPHYR_BASE}) project(app) @@ -22,6 +15,6 @@ target_sources(app PRIVATE ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ ) diff --git a/tests/bsim/bluetooth/host/att/read_fill_buf/server/CMakeLists.txt b/tests/bsim/bluetooth/host/att/read_fill_buf/server/CMakeLists.txt index 4ec37312541..663ac0cca51 100644 --- a/tests/bsim/bluetooth/host/att/read_fill_buf/server/CMakeLists.txt +++ b/tests/bsim/bluetooth/host/att/read_fill_buf/server/CMakeLists.txt @@ -2,13 +2,6 @@ cmake_minimum_required(VERSION 3.20.0) -if(NOT DEFINED ENV{BSIM_COMPONENTS_PATH}) - message(FATAL_ERROR "This test requires the BabbleSim simulator. Please set\ - the environment variable BSIM_COMPONENTS_PATH to point to its components \ - folder. More information can be found in\ - https://babblesim.github.io/folder_structure_and_env.html") -endif() - find_package(Zephyr HINTS $ENV{ZEPHYR_BASE}) project(app) @@ -19,6 +12,6 @@ target_sources(app PRIVATE ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ ) diff --git a/tests/bsim/bluetooth/host/gatt/caching/CMakeLists.txt b/tests/bsim/bluetooth/host/gatt/caching/CMakeLists.txt index a94b19ae64e..7869a21840f 100644 --- a/tests/bsim/bluetooth/host/gatt/caching/CMakeLists.txt +++ b/tests/bsim/bluetooth/host/gatt/caching/CMakeLists.txt @@ -9,6 +9,6 @@ FILE(GLOB app_sources src/*.c) target_sources(app PRIVATE ${app_sources} ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) diff --git a/tests/bsim/bluetooth/host/gatt/general/CMakeLists.txt b/tests/bsim/bluetooth/host/gatt/general/CMakeLists.txt index a94b19ae64e..7869a21840f 100644 --- a/tests/bsim/bluetooth/host/gatt/general/CMakeLists.txt +++ b/tests/bsim/bluetooth/host/gatt/general/CMakeLists.txt @@ -9,6 +9,6 @@ FILE(GLOB app_sources src/*.c) target_sources(app PRIVATE ${app_sources} ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) diff --git a/tests/bsim/bluetooth/host/gatt/notify/CMakeLists.txt b/tests/bsim/bluetooth/host/gatt/notify/CMakeLists.txt index a94b19ae64e..7869a21840f 100644 --- a/tests/bsim/bluetooth/host/gatt/notify/CMakeLists.txt +++ b/tests/bsim/bluetooth/host/gatt/notify/CMakeLists.txt @@ -9,6 +9,6 @@ FILE(GLOB app_sources src/*.c) target_sources(app PRIVATE ${app_sources} ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) diff --git a/tests/bsim/bluetooth/host/gatt/notify_multiple/CMakeLists.txt b/tests/bsim/bluetooth/host/gatt/notify_multiple/CMakeLists.txt index a94b19ae64e..7869a21840f 100644 --- a/tests/bsim/bluetooth/host/gatt/notify_multiple/CMakeLists.txt +++ b/tests/bsim/bluetooth/host/gatt/notify_multiple/CMakeLists.txt @@ -9,6 +9,6 @@ FILE(GLOB app_sources src/*.c) target_sources(app PRIVATE ${app_sources} ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) diff --git a/tests/bsim/bluetooth/host/gatt/settings/CMakeLists.txt b/tests/bsim/bluetooth/host/gatt/settings/CMakeLists.txt index ff8c912f855..32d9c0c6af4 100644 --- a/tests/bsim/bluetooth/host/gatt/settings/CMakeLists.txt +++ b/tests/bsim/bluetooth/host/gatt/settings/CMakeLists.txt @@ -15,6 +15,6 @@ target_sources(app PRIVATE ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) diff --git a/tests/bsim/bluetooth/host/l2cap/credits/CMakeLists.txt b/tests/bsim/bluetooth/host/l2cap/credits/CMakeLists.txt index a196b077b8d..c28d99b9d67 100644 --- a/tests/bsim/bluetooth/host/l2cap/credits/CMakeLists.txt +++ b/tests/bsim/bluetooth/host/l2cap/credits/CMakeLists.txt @@ -2,13 +2,6 @@ cmake_minimum_required(VERSION 3.20.0) -if (NOT DEFINED ENV{BSIM_COMPONENTS_PATH}) - message(FATAL_ERROR "This test requires the BabbleSim simulator. Please set\ - the environment variable BSIM_COMPONENTS_PATH to point to its components \ - folder. More information can be found in\ - https://babblesim.github.io/folder_structure_and_env.html") -endif() - find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project(bsim_test_l2cap_credits) @@ -16,6 +9,6 @@ FILE(GLOB app_sources src/*.c) target_sources(app PRIVATE ${app_sources} ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) diff --git a/tests/bsim/bluetooth/host/l2cap/general/CMakeLists.txt b/tests/bsim/bluetooth/host/l2cap/general/CMakeLists.txt index cdd310bc683..6adc381f4f5 100644 --- a/tests/bsim/bluetooth/host/l2cap/general/CMakeLists.txt +++ b/tests/bsim/bluetooth/host/l2cap/general/CMakeLists.txt @@ -9,6 +9,6 @@ FILE(GLOB app_sources src/*.c) target_sources(app PRIVATE ${app_sources} ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) diff --git a/tests/bsim/bluetooth/host/l2cap/split/dut/CMakeLists.txt b/tests/bsim/bluetooth/host/l2cap/split/dut/CMakeLists.txt index c53b78b20e5..e5120c13de0 100644 --- a/tests/bsim/bluetooth/host/l2cap/split/dut/CMakeLists.txt +++ b/tests/bsim/bluetooth/host/l2cap/split/dut/CMakeLists.txt @@ -2,13 +2,6 @@ cmake_minimum_required(VERSION 3.20.0) -if (NOT DEFINED ENV{BSIM_COMPONENTS_PATH}) - message(FATAL_ERROR "This test requires the BabbleSim simulator. Please set\ - the environment variable BSIM_COMPONENTS_PATH to point to its components \ - folder. More information can be found in\ - https://babblesim.github.io/folder_structure_and_env.html") -endif() - find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project(bsim_test_l2cap_split_dut) @@ -18,6 +11,6 @@ target_sources(app PRIVATE zephyr_include_directories( ../common/ - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) diff --git a/tests/bsim/bluetooth/host/l2cap/split/tester/CMakeLists.txt b/tests/bsim/bluetooth/host/l2cap/split/tester/CMakeLists.txt index 6ca51b764d9..d294025336c 100644 --- a/tests/bsim/bluetooth/host/l2cap/split/tester/CMakeLists.txt +++ b/tests/bsim/bluetooth/host/l2cap/split/tester/CMakeLists.txt @@ -2,13 +2,6 @@ cmake_minimum_required(VERSION 3.20.0) -if (NOT DEFINED ENV{BSIM_COMPONENTS_PATH}) - message(FATAL_ERROR "This test requires the BabbleSim simulator. Please set\ - the environment variable BSIM_COMPONENTS_PATH to point to its components \ - folder. More information can be found in\ - https://babblesim.github.io/folder_structure_and_env.html") -endif() - find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project(bsim_test_l2cap_split_tester) @@ -17,6 +10,6 @@ target_sources(app PRIVATE src/main.c) zephyr_include_directories( ../common/ ${ZEPHYR_BASE}/subsys/bluetooth/common/ - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) diff --git a/tests/bsim/bluetooth/host/l2cap/stress/CMakeLists.txt b/tests/bsim/bluetooth/host/l2cap/stress/CMakeLists.txt index 3b59d6f6d5a..88c326dddf3 100644 --- a/tests/bsim/bluetooth/host/l2cap/stress/CMakeLists.txt +++ b/tests/bsim/bluetooth/host/l2cap/stress/CMakeLists.txt @@ -9,6 +9,6 @@ FILE(GLOB app_sources src/*.c) target_sources(app PRIVATE ${app_sources} ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) diff --git a/tests/bsim/bluetooth/host/l2cap/userdata/CMakeLists.txt b/tests/bsim/bluetooth/host/l2cap/userdata/CMakeLists.txt index 52c0aa6b8f9..298213989f5 100644 --- a/tests/bsim/bluetooth/host/l2cap/userdata/CMakeLists.txt +++ b/tests/bsim/bluetooth/host/l2cap/userdata/CMakeLists.txt @@ -9,6 +9,6 @@ FILE(GLOB app_sources src/*.c) target_sources(app PRIVATE ${app_sources} ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) diff --git a/tests/bsim/bluetooth/host/misc/disable/CMakeLists.txt b/tests/bsim/bluetooth/host/misc/disable/CMakeLists.txt index 3e138b9a391..78c6674ff11 100644 --- a/tests/bsim/bluetooth/host/misc/disable/CMakeLists.txt +++ b/tests/bsim/bluetooth/host/misc/disable/CMakeLists.txt @@ -9,6 +9,6 @@ FILE(GLOB app_sources src/*.c) target_sources(app PRIVATE ${app_sources} ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) diff --git a/tests/bsim/bluetooth/host/privacy/central/CMakeLists.txt b/tests/bsim/bluetooth/host/privacy/central/CMakeLists.txt index 84d4f962e1f..75e1deb8f82 100644 --- a/tests/bsim/bluetooth/host/privacy/central/CMakeLists.txt +++ b/tests/bsim/bluetooth/host/privacy/central/CMakeLists.txt @@ -13,6 +13,6 @@ target_sources(app PRIVATE ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) diff --git a/tests/bsim/bluetooth/host/privacy/device/CMakeLists.txt b/tests/bsim/bluetooth/host/privacy/device/CMakeLists.txt index aa1d871ba69..695ed8b17c0 100644 --- a/tests/bsim/bluetooth/host/privacy/device/CMakeLists.txt +++ b/tests/bsim/bluetooth/host/privacy/device/CMakeLists.txt @@ -12,7 +12,7 @@ target_sources(app PRIVATE ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${ZEPHYR_BASE}/subsys/bluetooth/host/ ) diff --git a/tests/bsim/bluetooth/host/privacy/peripheral/CMakeLists.txt b/tests/bsim/bluetooth/host/privacy/peripheral/CMakeLists.txt index 07c590b9c76..a44cd8b685d 100644 --- a/tests/bsim/bluetooth/host/privacy/peripheral/CMakeLists.txt +++ b/tests/bsim/bluetooth/host/privacy/peripheral/CMakeLists.txt @@ -13,6 +13,6 @@ target_sources(app PRIVATE ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) diff --git a/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/CMakeLists.txt b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/CMakeLists.txt index e1a0a70d2f4..6ff34818db7 100644 --- a/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/CMakeLists.txt +++ b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/CMakeLists.txt @@ -13,6 +13,6 @@ target_sources(app PRIVATE ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) diff --git a/tests/bsim/bluetooth/host/security/bond_overwrite_denied/CMakeLists.txt b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/CMakeLists.txt index e1a0a70d2f4..6ff34818db7 100644 --- a/tests/bsim/bluetooth/host/security/bond_overwrite_denied/CMakeLists.txt +++ b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/CMakeLists.txt @@ -13,6 +13,6 @@ target_sources(app PRIVATE ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) diff --git a/tests/bsim/bluetooth/ll/advx/CMakeLists.txt b/tests/bsim/bluetooth/ll/advx/CMakeLists.txt index 1b820f33b43..e13291c5e45 100644 --- a/tests/bsim/bluetooth/ll/advx/CMakeLists.txt +++ b/tests/bsim/bluetooth/ll/advx/CMakeLists.txt @@ -8,7 +8,7 @@ project(bsim_test_advx) target_sources(app PRIVATE src/main.c) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${ZEPHYR_BASE}/subsys/bluetooth/controller/include ) diff --git a/tests/bsim/bluetooth/ll/conn/CMakeLists.txt b/tests/bsim/bluetooth/ll/conn/CMakeLists.txt index 45721b45b63..d67318d61fe 100644 --- a/tests/bsim/bluetooth/ll/conn/CMakeLists.txt +++ b/tests/bsim/bluetooth/ll/conn/CMakeLists.txt @@ -13,7 +13,7 @@ target_sources(app PRIVATE ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${ZEPHYR_BASE}/samples/bluetooth ) diff --git a/tests/bsim/bluetooth/ll/edtt/gatt_test_app/CMakeLists.txt b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/CMakeLists.txt index 40c8247c95b..bdbedd66633 100644 --- a/tests/bsim/bluetooth/ll/edtt/gatt_test_app/CMakeLists.txt +++ b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/CMakeLists.txt @@ -17,6 +17,6 @@ target_sources(app PRIVATE zephyr_library_include_directories(${ZEPHYR_BASE}/samples/bluetooth ../common/ src/ - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) diff --git a/tests/bsim/bluetooth/ll/edtt/hci_test_app/CMakeLists.txt b/tests/bsim/bluetooth/ll/edtt/hci_test_app/CMakeLists.txt index d5c6081131f..4c22b92ab07 100644 --- a/tests/bsim/bluetooth/ll/edtt/hci_test_app/CMakeLists.txt +++ b/tests/bsim/bluetooth/ll/edtt/hci_test_app/CMakeLists.txt @@ -15,6 +15,6 @@ zephyr_library_include_directories( ${ZEPHYR_BASE}/samples/bluetooth ${ZEPHYR_BASE}/subsys/bluetooth ../common/ - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) diff --git a/tests/bsim/bluetooth/ll/iso/CMakeLists.txt b/tests/bsim/bluetooth/ll/iso/CMakeLists.txt index be5624c2fc9..ebb933980a3 100644 --- a/tests/bsim/bluetooth/ll/iso/CMakeLists.txt +++ b/tests/bsim/bluetooth/ll/iso/CMakeLists.txt @@ -9,7 +9,7 @@ target_sources(app PRIVATE src/main.c) zephyr_include_directories( ${ZEPHYR_BASE} - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${ZEPHYR_BASE}/subsys/bluetooth/controller/include ) diff --git a/tests/bsim/bluetooth/ll/multiple_id/CMakeLists.txt b/tests/bsim/bluetooth/ll/multiple_id/CMakeLists.txt index 6dd1c5092b9..151639ce173 100644 --- a/tests/bsim/bluetooth/ll/multiple_id/CMakeLists.txt +++ b/tests/bsim/bluetooth/ll/multiple_id/CMakeLists.txt @@ -12,6 +12,6 @@ target_sources(app PRIVATE ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) diff --git a/tests/bsim/bluetooth/ll/throughput/CMakeLists.txt b/tests/bsim/bluetooth/ll/throughput/CMakeLists.txt index 92fa4a1edd4..432d96b77bc 100644 --- a/tests/bsim/bluetooth/ll/throughput/CMakeLists.txt +++ b/tests/bsim/bluetooth/ll/throughput/CMakeLists.txt @@ -13,6 +13,6 @@ target_sources(app PRIVATE ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) diff --git a/tests/bsim/bluetooth/mesh/CMakeLists.txt b/tests/bsim/bluetooth/mesh/CMakeLists.txt index 0813d477dbe..3c9bb53fa17 100644 --- a/tests/bsim/bluetooth/mesh/CMakeLists.txt +++ b/tests/bsim/bluetooth/mesh/CMakeLists.txt @@ -73,6 +73,6 @@ else() endif() zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) diff --git a/tests/bsim/net/sockets/echo_test/CMakeLists.txt b/tests/bsim/net/sockets/echo_test/CMakeLists.txt index f47c68435c5..9cbe35bbdf6 100644 --- a/tests/bsim/net/sockets/echo_test/CMakeLists.txt +++ b/tests/bsim/net/sockets/echo_test/CMakeLists.txt @@ -42,6 +42,6 @@ generate_inc_file_for_target( ) zephyr_include_directories( - $ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ - $ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ + ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ + ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ )