From c62dbb13867f37f9d1fc4271ded6230b4d0c4e18 Mon Sep 17 00:00:00 2001 From: Thomas Gagneret Date: Wed, 17 Jan 2024 15:56:59 +0100 Subject: [PATCH] cmake: zephyr_module: Remove useless 'west_arg' variable 8cc716792ac5aaadd9c4601607abda4504e7044c renamed this variable to lower case to indicate it's only used locally however WEST_ARG is used as a parameter of zephyr_module.py in CMakeLists.txt when CONFIG_BUILD_OUTPUT_META is enabled. This variable was used when west had some limitation. It does not really make sense now, so it has been removed and content of west_arg variable has been added by default. Signed-off-by: Thomas Gagneret --- CMakeLists.txt | 2 +- cmake/modules/zephyr_module.cmake | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e3e65cf26eb..76d8466b8df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1627,10 +1627,10 @@ if(CONFIG_BUILD_OUTPUT_META) list(APPEND post_build_commands COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/zephyr_module.py - ${WEST_ARG} ${ZEPHYR_MODULES_ARG} ${EXTRA_ZEPHYR_MODULES_ARG} --meta-out ${KERNEL_META_PATH} + --zephyr-base=${ZEPHYR_BASE} $<$:--meta-state-propagate> ) list(APPEND diff --git a/cmake/modules/zephyr_module.cmake b/cmake/modules/zephyr_module.cmake index 90afc1f02e5..50ee05dfe25 100644 --- a/cmake/modules/zephyr_module.cmake +++ b/cmake/modules/zephyr_module.cmake @@ -48,17 +48,13 @@ set(cmake_modules_file ${CMAKE_BINARY_DIR}/zephyr_modules.txt) set(cmake_sysbuild_file ${CMAKE_BINARY_DIR}/sysbuild_modules.txt) set(zephyr_settings_file ${CMAKE_BINARY_DIR}/zephyr_settings.txt) -if(WEST) - set(west_arg "--zephyr-base" ${ZEPHYR_BASE}) -endif() - if(WEST OR ZEPHYR_MODULES) # Zephyr module uses west, so only call it if west is installed or # ZEPHYR_MODULES was provided as argument to CMake. execute_process( COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/zephyr_module.py - ${west_arg} + --zephyr-base=${ZEPHYR_BASE} ${ZEPHYR_MODULES_ARG} ${EXTRA_ZEPHYR_MODULES_ARG} --kconfig-out ${kconfig_modules_file}