mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-05 13:50:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'implicit-includes' into release-3.14

Browse Source 
Merge-request: !3157
This commit is contained in:
Brad King
2019-03-29 08:49:34 -04:00
parent 04c0efd4b7 dad86f1873
commit 30159fe751
17 changed files with 92 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/CMakeParseImplicitIncludeInfo.cmake
+14 -2
View File
@@ -210,15 +210,27 @@ function(cmake_parse_implicit_include_info text lang dir_var log_var state_var)
endif()
endforeach()
set(implicit_dirs "")
foreach(d IN LISTS implicit_dirs_tmp)
if(IS_ABSOLUTE "${d}")
get_filename_component(dir "${d}" ABSOLUTE)
list(APPEND implicit_dirs "${dir}")
string(APPEND log " collapse include dir [${d}] ==> [${dir}]\n")
else()
string(APPEND log " skipping relative include dir [${d}]\n")
endif()
endforeach()
list(REMOVE_DUPLICATES implicit_dirs)
# Log results.
if(state STREQUAL done)
string(APPEND log " implicit include dirs: [${implicit_dirs_tmp}]\n")
string(APPEND log " implicit include dirs: [${implicit_dirs}]\n")
else()
string(APPEND log " warn: unable to parse implicit include dirs!\n")
endif()
# Return results.
set(${dir_var} "${implicit_dirs_tmp}" PARENT_SCOPE)
set(${dir_var} "${implicit_dirs}" PARENT_SCOPE)
set(${log_var} "${log}" PARENT_SCOPE)
set(${state_var} "${state}" PARENT_SCOPE)