|
 |
bc5d70 |
From 31b8b28fedbf102740eebd7ff9148188ed00a26e Mon Sep 17 00:00:00 2001
|
|
|
bc5d70 |
From: Robert Maynard <robert.maynard@kitware.com>
|
|
|
bc5d70 |
Date: Tue, 20 Aug 2019 17:38:53 -0400
|
|
|
bc5d70 |
Subject: [PATCH] FindMPI: Restore MPI_<LANG>_COMPILE_FLAGS and
|
|
|
bc5d70 |
MPI_<LANG>_COMPILE_OPTIONS
|
|
|
bc5d70 |
|
|
|
bc5d70 |
In commit e374b9f1eb (FindMPI: Restore MPI_<LANG>_COMPILE_FLAGS as a
|
|
|
bc5d70 |
command-line string, 2018-09-10, v3.12.3~6^2) we tried to restore the
|
|
|
bc5d70 |
compile flags but accidentally inverted the arguments to `list(JOIN)`
|
|
|
bc5d70 |
causing both `MPI_<LANG>_COMPILE_FLAGS` and `MPI_<LANG>_COMPILE_OPTIONS`
|
|
|
bc5d70 |
to be empty.
|
|
|
bc5d70 |
|
|
|
bc5d70 |
Issue: #18349
|
|
|
bc5d70 |
---
|
|
|
bc5d70 |
Modules/FindMPI.cmake | 2 +-
|
|
|
bc5d70 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
bc5d70 |
|
|
|
bc5d70 |
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
|
|
|
bc5d70 |
index 9471be8..2b9b20c 100644
|
|
|
bc5d70 |
--- a/Modules/FindMPI.cmake
|
|
|
bc5d70 |
+++ b/Modules/FindMPI.cmake
|
|
|
bc5d70 |
@@ -1698,7 +1698,7 @@ foreach(LANG IN ITEMS C CXX Fortran)
|
|
|
bc5d70 |
set(MPI_${LANG}_INCLUDE_PATH "${MPI_${LANG}_INCLUDE_DIRS}")
|
|
|
bc5d70 |
unset(MPI_${LANG}_COMPILE_FLAGS)
|
|
|
bc5d70 |
if(MPI_${LANG}_COMPILE_OPTIONS)
|
|
|
bc5d70 |
- list(JOIN MPI_${LANG}_COMPILE_FLAGS " " MPI_${LANG}_COMPILE_OPTIONS)
|
|
|
bc5d70 |
+ list(JOIN MPI_${LANG}_COMPILE_OPTIONS " " MPI_${LANG}_COMPILE_FLAGS)
|
|
|
bc5d70 |
endif()
|
|
|
bc5d70 |
if(MPI_${LANG}_COMPILE_DEFINITIONS)
|
|
|
bc5d70 |
foreach(_MPI_DEF IN LISTS MPI_${LANG}_COMPILE_DEFINITIONS)
|
|
|
bc5d70 |
--
|
|
|
bc5d70 |
1.8.3.1
|
|
|
bc5d70 |
|