diff options
| author | Brad King <brad.king@kitware.com> | 2024-07-02 12:34:54 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-07-02 12:35:58 (GMT) |
| commit | 73f368b3c1b85d5e2abe2ad49f6e856b69600a39 (patch) | |
| tree | bd0ab4b2a67f3e42cb1bb0f58849e32c1f04bf36 | |
| parent | db7d89369a2045e619ab905744c7eaf0edd3de0a (diff) | |
| parent | 8ba3441bd2e5b5126ad7ad5fbcd5ec97cb853e1e (diff) | |
| download | CMake-73f368b3c1b85d5e2abe2ad49f6e856b69600a39.zip CMake-73f368b3c1b85d5e2abe2ad49f6e856b69600a39.tar.gz CMake-73f368b3c1b85d5e2abe2ad49f6e856b69600a39.tar.bz2 | |
Merge topic 'find_mpi-support-newlines-in-output'
8ba3441bd2 FindMPI include parsing better handles leading newlines
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9636
| -rw-r--r-- | Modules/FindMPI.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake index aa322ac..0f06c57 100644 --- a/Modules/FindMPI.cmake +++ b/Modules/FindMPI.cmake @@ -683,7 +683,7 @@ function (_MPI_interrogate_compiler LANG) endforeach() # Extract include paths from compile command line - string(REGEX MATCHALL "(^| )${_MPI_PREPROCESSOR_FLAG_REGEX}${CMAKE_INCLUDE_FLAG_${LANG}} *([^\" ]+|\"[^\"]+\")" + string(REGEX MATCHALL "(^|\n| )${_MPI_PREPROCESSOR_FLAG_REGEX}${CMAKE_INCLUDE_FLAG_${LANG}} *([^\" ]+|\"[^\"]+\")" MPI_ALL_INCLUDE_PATHS "${MPI_COMPILE_CMDLINE}") # If extracting failed to work, we'll try using -showme:incdirs. @@ -698,6 +698,7 @@ function (_MPI_interrogate_compiler LANG) foreach(_MPI_INCLUDE_PATH IN LISTS MPI_ALL_INCLUDE_PATHS) string(REGEX REPLACE "^ ?${_MPI_PREPROCESSOR_FLAG_REGEX}${CMAKE_INCLUDE_FLAG_${LANG}} *" "" _MPI_INCLUDE_PATH "${_MPI_INCLUDE_PATH}") + string(REPLACE "\n" "" _MPI_INCLUDE_PATH "${_MPI_INCLUDE_PATH}") string(REPLACE "\"" "" _MPI_INCLUDE_PATH "${_MPI_INCLUDE_PATH}") string(REPLACE "'" "" _MPI_INCLUDE_PATH "${_MPI_INCLUDE_PATH}") get_filename_component(_MPI_INCLUDE_PATH "${_MPI_INCLUDE_PATH}" REALPATH) |