patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

cmake: Fix USER_CACHE_DIR path generation

Browse source 
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 <mb@lee-brunnen.de>
This commit is contained in:
Manoel Brunnen 2023-05-08 09:37:41 +02:00 committed by Carles Cufí
parent 926219156b
commit 3953de793f
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/modules/user_cache.cmake
View file

@ -59,7 +59,7 @@ function(find_appropriate_cache_directory dir)
if(DEFINED ENV{${env_var}}) if(DEFINED ENV{${env_var}})
set(env_dir $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} execute_process(COMMAND ${PYTHON_EXECUTABLE}
${ZEPHYR_BASE}/scripts/build/dir_is_writeable.py ${test_user_dir} ${ZEPHYR_BASE}/scripts/build/dir_is_writeable.py ${test_user_dir}