bsim: cmake: Remove unnecessary references to environment

These variables are now provided by the FindBabbleSim
cmake module, which finds them in the environment or thru
west.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
This commit is contained in:
Alberto Escolar Piedras 2023-04-28 16:13:27 +02:00 committed by Carles Cufí
commit e1fabfa9a4
38 changed files with 75 additions and 110 deletions

View file

@ -4,7 +4,7 @@ zephyr_library()
if (${CONFIG_BSIM_CONSOLE}) if (${CONFIG_BSIM_CONSOLE})
zephyr_library_sources(bsim_console.c) 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() endif()
zephyr_library_sources_ifdef(CONFIG_GSM_MUX gsm_mux.c) zephyr_library_sources_ifdef(CONFIG_GSM_MUX gsm_mux.c)

View file

@ -9,7 +9,7 @@ FILE(GLOB app_sources src/*.c)
target_sources(app PRIVATE ${app_sources} ) target_sources(app PRIVATE ${app_sources} )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
${ZEPHYR_BASE}/subsys/bluetooth/host/audio/ ${ZEPHYR_BASE}/subsys/bluetooth/host/audio/
) )

View file

@ -12,6 +12,6 @@ target_sources(app PRIVATE
) )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )

View file

@ -13,6 +13,6 @@ target_sources(app PRIVATE
) )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )

View file

@ -12,8 +12,8 @@ target_sources(app PRIVATE
) )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
${ZEPHYR_BASE}/samples/bluetooth/encrypted_advertising/peripheral/src/ ${ZEPHYR_BASE}/samples/bluetooth/encrypted_advertising/peripheral/src/
${ZEPHYR_BASE}/samples/bluetooth/encrypted_advertising/include/ ${ZEPHYR_BASE}/samples/bluetooth/encrypted_advertising/include/

View file

@ -13,7 +13,7 @@ target_sources(app PRIVATE
) )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
${ZEPHYR_BASE}/subsys/bluetooth/host/audio/ ${ZEPHYR_BASE}/subsys/bluetooth/host/audio/
) )

View file

@ -13,6 +13,6 @@ target_sources(app PRIVATE
) )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )

View file

@ -16,6 +16,6 @@ target_sources(app PRIVATE
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )

View file

@ -9,6 +9,6 @@ FILE(GLOB app_sources src/*.c)
target_sources(app PRIVATE ${app_sources} ) target_sources(app PRIVATE ${app_sources} )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )

View file

@ -12,6 +12,6 @@ target_sources(app PRIVATE
) )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )

View file

@ -2,13 +2,6 @@
cmake_minimum_required(VERSION 3.20.0) 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}) find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
project(app) project(app)
@ -22,6 +15,6 @@ target_sources(app PRIVATE
) )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
) )

View file

@ -2,13 +2,6 @@
cmake_minimum_required(VERSION 3.20.0) 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}) find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
project(app) project(app)
@ -19,6 +12,6 @@ target_sources(app PRIVATE
) )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
) )

View file

@ -9,6 +9,6 @@ FILE(GLOB app_sources src/*.c)
target_sources(app PRIVATE ${app_sources} ) target_sources(app PRIVATE ${app_sources} )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )

View file

@ -9,6 +9,6 @@ FILE(GLOB app_sources src/*.c)
target_sources(app PRIVATE ${app_sources} ) target_sources(app PRIVATE ${app_sources} )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )

View file

@ -9,6 +9,6 @@ FILE(GLOB app_sources src/*.c)
target_sources(app PRIVATE ${app_sources} ) target_sources(app PRIVATE ${app_sources} )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )

View file

@ -9,6 +9,6 @@ FILE(GLOB app_sources src/*.c)
target_sources(app PRIVATE ${app_sources} ) target_sources(app PRIVATE ${app_sources} )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )

View file

@ -15,6 +15,6 @@ target_sources(app PRIVATE
) )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )

View file

@ -2,13 +2,6 @@
cmake_minimum_required(VERSION 3.20.0) 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}) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(bsim_test_l2cap_credits) project(bsim_test_l2cap_credits)
@ -16,6 +9,6 @@ FILE(GLOB app_sources src/*.c)
target_sources(app PRIVATE ${app_sources} ) target_sources(app PRIVATE ${app_sources} )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )

View file

@ -9,6 +9,6 @@ FILE(GLOB app_sources src/*.c)
target_sources(app PRIVATE ${app_sources} ) target_sources(app PRIVATE ${app_sources} )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )

View file

@ -2,13 +2,6 @@
cmake_minimum_required(VERSION 3.20.0) 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}) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(bsim_test_l2cap_split_dut) project(bsim_test_l2cap_split_dut)
@ -18,6 +11,6 @@ target_sources(app PRIVATE
zephyr_include_directories( zephyr_include_directories(
../common/ ../common/
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )

View file

@ -2,13 +2,6 @@
cmake_minimum_required(VERSION 3.20.0) 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}) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(bsim_test_l2cap_split_tester) project(bsim_test_l2cap_split_tester)
@ -17,6 +10,6 @@ target_sources(app PRIVATE src/main.c)
zephyr_include_directories( zephyr_include_directories(
../common/ ../common/
${ZEPHYR_BASE}/subsys/bluetooth/common/ ${ZEPHYR_BASE}/subsys/bluetooth/common/
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )

View file

@ -9,6 +9,6 @@ FILE(GLOB app_sources src/*.c)
target_sources(app PRIVATE ${app_sources} ) target_sources(app PRIVATE ${app_sources} )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )

View file

@ -9,6 +9,6 @@ FILE(GLOB app_sources src/*.c)
target_sources(app PRIVATE ${app_sources} ) target_sources(app PRIVATE ${app_sources} )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )

View file

@ -9,6 +9,6 @@ FILE(GLOB app_sources src/*.c)
target_sources(app PRIVATE ${app_sources} ) target_sources(app PRIVATE ${app_sources} )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )

View file

@ -13,6 +13,6 @@ target_sources(app PRIVATE
) )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )

View file

@ -12,7 +12,7 @@ target_sources(app PRIVATE
) )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
${ZEPHYR_BASE}/subsys/bluetooth/host/ ${ZEPHYR_BASE}/subsys/bluetooth/host/
) )

View file

@ -13,6 +13,6 @@ target_sources(app PRIVATE
) )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )

View file

@ -13,6 +13,6 @@ target_sources(app PRIVATE
) )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )

View file

@ -13,6 +13,6 @@ target_sources(app PRIVATE
) )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )

View file

@ -8,7 +8,7 @@ project(bsim_test_advx)
target_sources(app PRIVATE src/main.c) target_sources(app PRIVATE src/main.c)
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
${ZEPHYR_BASE}/subsys/bluetooth/controller/include ${ZEPHYR_BASE}/subsys/bluetooth/controller/include
) )

View file

@ -13,7 +13,7 @@ target_sources(app PRIVATE
) )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
${ZEPHYR_BASE}/samples/bluetooth ${ZEPHYR_BASE}/samples/bluetooth
) )

View file

@ -17,6 +17,6 @@ target_sources(app PRIVATE
zephyr_library_include_directories(${ZEPHYR_BASE}/samples/bluetooth zephyr_library_include_directories(${ZEPHYR_BASE}/samples/bluetooth
../common/ ../common/
src/ src/
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )

View file

@ -15,6 +15,6 @@ zephyr_library_include_directories(
${ZEPHYR_BASE}/samples/bluetooth ${ZEPHYR_BASE}/samples/bluetooth
${ZEPHYR_BASE}/subsys/bluetooth ${ZEPHYR_BASE}/subsys/bluetooth
../common/ ../common/
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )

View file

@ -9,7 +9,7 @@ target_sources(app PRIVATE src/main.c)
zephyr_include_directories( zephyr_include_directories(
${ZEPHYR_BASE} ${ZEPHYR_BASE}
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
${ZEPHYR_BASE}/subsys/bluetooth/controller/include ${ZEPHYR_BASE}/subsys/bluetooth/controller/include
) )

View file

@ -12,6 +12,6 @@ target_sources(app PRIVATE
) )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )

View file

@ -13,6 +13,6 @@ target_sources(app PRIVATE
) )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )

View file

@ -73,6 +73,6 @@ else()
endif() endif()
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )

View file

@ -42,6 +42,6 @@ generate_inc_file_for_target(
) )
zephyr_include_directories( zephyr_include_directories(
$ENV{BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
$ENV{BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
) )