diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-09 17:14:24 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-07-09 17:14:24 (GMT) |
| commit | 366746bbef613f9d258e66a32f8fbacd407acfba (patch) | |
| tree | 39c8981a4fc80ebd665f8dad7ccb6aea68a0e33a /Modules | |
| parent | c54fc8213bfbd33b9584188b90cd494e2bf515db (diff) | |
| parent | 98e371f13e0a8dc35367f98b027f62802b3ed280 (diff) | |
| download | CMake-366746bbef613f9d258e66a32f8fbacd407acfba.zip CMake-366746bbef613f9d258e66a32f8fbacd407acfba.tar.gz CMake-366746bbef613f9d258e66a32f8fbacd407acfba.tar.bz2 | |
Merge branch 'backport-implicit-includes-cray-hlist' into release-3.14
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 c42474b..f044b10 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) |