diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-10 13:20:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-07-10 13:21:24 (GMT) |
| commit | 96a35a8eed624ec326f13d1e7d3d735c7b35bcae (patch) | |
| tree | 2a4a550a9696770e9cfa68058409868b900fa4d4 /Modules | |
| parent | 29a1a68e903640bd79483e4b6ba13bd93fe3a3f5 (diff) | |
| parent | 0a7b61269c48b43cbc6677c0871ce3d519d460d6 (diff) | |
| download | CMake-96a35a8eed624ec326f13d1e7d3d735c7b35bcae.zip CMake-96a35a8eed624ec326f13d1e7d3d735c7b35bcae.tar.gz CMake-96a35a8eed624ec326f13d1e7d3d735c7b35bcae.tar.bz2 | |
Merge topic 'implicit-includes-cray-hlist'
0a7b61269c Merge branch 'backport-implicit-includes-cray-hlist'
98e371f13e Cray: Fix include parsing when the -hlist= flag is present
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3532
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeParseImplicitIncludeInfo.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CMakeParseImplicitIncludeInfo.cmake b/Modules/CMakeParseImplicitIncludeInfo.cmake index 176b3ff..91d03cd 100644 --- a/Modules/CMakeParseImplicitIncludeInfo.cmake +++ b/Modules/CMakeParseImplicitIncludeInfo.cmake @@ -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) |