diff options
| author | Fred Baksik <fdk17@ftml.net> | 2022-02-23 13:51:38 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-02-23 16:33:35 (GMT) |
| commit | 005c7dc9e7c0789b13d1b8c4f793ff68c78334b2 (patch) | |
| tree | 7ac0c2f2df50b83e96e9762fecd5cbaedc050b57 | |
| parent | 352ea99bbacf6e57bca47f43725d98b2a4a0b87d (diff) | |
| download | CMake-005c7dc9e7c0789b13d1b8c4f793ff68c78334b2.zip CMake-005c7dc9e7c0789b13d1b8c4f793ff68c78334b2.tar.gz CMake-005c7dc9e7c0789b13d1b8c4f793ff68c78334b2.tar.bz2 | |
GHS: Store full path of Integrity OS directory
Fixes build project error because the OS directory was a relative
path from the binary directory.
Fixes issue during project regeneration where the `-os_dir` project option
was missing because GHS_OS_DIR was not properly stored in the cache
file.
This error was introduced by commit aa59eaac4f (GHS: Allow setting GHS
variables from toolchain file, 2021-11-15, v3.23.0-rc1~337^2).
| -rw-r--r-- | Modules/Platform/GHS-MULTI-Determine.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Platform/GHS-MULTI-Determine.cmake b/Modules/Platform/GHS-MULTI-Determine.cmake index 96f0162..67464f7 100644 --- a/Modules/Platform/GHS-MULTI-Determine.cmake +++ b/Modules/Platform/GHS-MULTI-Determine.cmake @@ -88,8 +88,8 @@ if(_ghs_os_dir AND NOT DEFINED GHS_OS_DIR) # Select latest? of matching candidates if(GHS_CANDIDATE_OS_DIRS) list(SORT GHS_CANDIDATE_OS_DIRS) - list(GET GHS_CANDIDATE_OS_DIRS -1 GHS_OS_DIR) - string(CONCAT _ghs_os_dir ${GHS_OS_ROOT} "/" ${GHS_OS_DIR}) + list(GET GHS_CANDIDATE_OS_DIRS -1 _ghs_os_dir) + string(CONCAT _ghs_os_dir ${GHS_OS_ROOT} "/" ${_ghs_os_dir}) endif() endif() endif() |