mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 08:20:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

GHS: Store full path of Integrity OS directory

Browse Source 
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).
This commit is contained in:
Fred Baksik
2022-02-23 08:51:38 -05:00
committed by Brad King
parent 352ea99bba
commit 005c7dc9e7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/Platform/GHS-MULTI-Determine.cmake
View File

@@ -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()