mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-20 21:28:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-implicit-includes-cray-hlist' into release-3.14

Browse Source 
Merge-request: !3532
This commit is contained in:
Brad King
2019-07-09 13:14:24 -04:00
parent c54fc8213b 98e371f13e
commit 366746bbef
8 changed files with 167 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/CMakeParseImplicitIncludeInfo.cmake
+2 -2
View File
@@ -15,9 +15,9 @@ function(cmake_parse_implicit_include_line line lang id_var log_var state_var)
if("${CMAKE_${lang}_COMPILER_ID}" STREQUAL "Cray" AND
"${line}" MATCHES "^/" AND "${line}" MATCHES "/ccfe |/ftnfe " AND
"${line}" MATCHES " -isystem| -I")
string(REGEX MATCHALL " (-I ?|-isystem )([^ ]*)" incs "${line}")
string(REGEX MATCHALL " (-I ?|-isystem )(\"[^\"]+\"|[^ \"]+)" incs "${line}")
foreach(inc IN LISTS incs)
string(REGEX REPLACE " (-I ?|-isystem )([^ ]*)" "\\2" idir "${inc}")
string(REGEX REPLACE " (-I ?|-isystem )(\"[^\"]+\"|[^ \"]+)" "\\2" idir "${inc}")
list(APPEND rv "${idir}")
endforeach()
if(rv)