From 3953de793fc376d8ffd1c973ec6315fdd36353ab Mon Sep 17 00:00:00 2001 From: Manoel Brunnen Date: Mon, 8 May 2023 09:37:41 +0200 Subject: [PATCH] cmake: Fix USER_CACHE_DIR path generation When the optional env_suffix_${env_var} was not set, USER_CACHE_DIR was slightly malformed and had double slashes, e.g. /home/user/.cache//zephyr. To fix it string(JOIN ...) is used, which only sets slashes when necessary. Signed-off-by: Manoel Brunnen --- cmake/modules/user_cache.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/modules/user_cache.cmake b/cmake/modules/user_cache.cmake index 1e8b59d6756..ab6b2dfdac7 100644 --- a/cmake/modules/user_cache.cmake +++ b/cmake/modules/user_cache.cmake @@ -59,7 +59,7 @@ function(find_appropriate_cache_directory dir) if(DEFINED ENV{${env_var}}) set(env_dir $ENV{${env_var}}) - set(test_user_dir ${env_dir}/${env_suffix_${env_var}}) + string(JOIN "/" test_user_dir ${env_dir} ${env_suffix_${env_var}}) execute_process(COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/build/dir_is_writeable.py ${test_user_dir}