From 3c9aa927ee55c77153cbac4ffe28cc4f36a73257 Mon Sep 17 00:00:00 2001 From: Ming Shao Date: Fri, 9 Dec 2022 22:29:19 +0800 Subject: [PATCH] cmake: fix the wrong arg name when calling check_zephyr_package() check_zephyr_package() accepts an one-value arg named "WORKSPACE_DIR". But it is called with "CURRENT_WORKSPACE_DIR". Signed-off-by: Ming Shao --- share/zephyr-package/cmake/ZephyrConfig.cmake | 2 +- share/zephyr-package/cmake/ZephyrConfigVersion.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/zephyr-package/cmake/ZephyrConfig.cmake b/share/zephyr-package/cmake/ZephyrConfig.cmake index 80524629450..50abeb26fc3 100644 --- a/share/zephyr-package/cmake/ZephyrConfig.cmake +++ b/share/zephyr-package/cmake/ZephyrConfig.cmake @@ -137,7 +137,7 @@ if(NOT IS_INCLUDED) # common path with the current sample. # and if so, we will return here, and let CMake call into the other registered package for real # version checking. - check_zephyr_package(CURRENT_WORKSPACE_DIR ${CURRENT_WORKSPACE_DIR}) + check_zephyr_package(WORKSPACE_DIR ${CURRENT_WORKSPACE_DIR}) if(ZEPHYR_PREFER) check_zephyr_package(SEARCH_PARENTS CANDIDATES_PREFERENCE_LIST ${ZEPHYR_PREFER}) diff --git a/share/zephyr-package/cmake/ZephyrConfigVersion.cmake b/share/zephyr-package/cmake/ZephyrConfigVersion.cmake index 3a52550e28a..45891b6ba8e 100644 --- a/share/zephyr-package/cmake/ZephyrConfigVersion.cmake +++ b/share/zephyr-package/cmake/ZephyrConfigVersion.cmake @@ -115,7 +115,7 @@ if(NOT IS_INCLUDED) # Project is a Zephyr workspace app. # This means this Zephyr is likely the correct one, but there could be an alternative installed along-side # Thus, check if there is an even better candidate. - check_zephyr_package(CURRENT_WORKSPACE_DIR ${CURRENT_WORKSPACE_DIR} VERSION_CHECK) + check_zephyr_package(WORKSPACE_DIR ${CURRENT_WORKSPACE_DIR} VERSION_CHECK) # We are the best candidate, so let's check our own version. check_zephyr_version()