浏览代码

Merge topic 'ghs_fix_rtos_dir' into release-3.23

005c7dc9e7 GHS: Store full path of Integrity OS directory

Acked-by: Kitware Robot <[email protected]>
Merge-request: !7017
Brad King 3 年之前
父节点
当前提交
7d110c25ed
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      Modules/Platform/GHS-MULTI-Determine.cmake

+ 2 - 2
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()