diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-10 12:57:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-07-10 12:57:55 (GMT) |
| commit | 98844aaa6f2309ebac5bf18e2cb24f5c44e6aa07 (patch) | |
| tree | 02c41cfc6f16880c88c8bdb4abfbe034d0b13f05 /Modules | |
| parent | e902a111182b27058cdea9d3f71b3fcb4d729476 (diff) | |
| parent | 0a7b61269c48b43cbc6677c0871ce3d519d460d6 (diff) | |
| download | CMake-98844aaa6f2309ebac5bf18e2cb24f5c44e6aa07.zip CMake-98844aaa6f2309ebac5bf18e2cb24f5c44e6aa07.tar.gz CMake-98844aaa6f2309ebac5bf18e2cb24f5c44e6aa07.tar.bz2 | |
Merge branch 'implicit-includes-cray-hlist' into release-3.15
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) |