33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From e374b9f1ebae70ca4381588362d6d3418f832ea7 Mon Sep 17 00:00:00 2001
|
|
From: Brad King <brad.king@kitware.com>
|
|
Date: Mon, 10 Sep 2018 14:30:59 -0400
|
|
Subject: [PATCH] FindMPI: Restore MPI_<LANG>_COMPILE_FLAGS as a command-line
|
|
string
|
|
|
|
Refactoring in commit v3.10.0-rc1~103^2~2 (FindMPI: Modernization from
|
|
ground up, 2017-04-25) accidentally left this variable set as a copy of
|
|
the `;`-list in `MPI_<LANG>_COMPILE_OPTIONS`, but the flags variable is
|
|
documented as a command-line string. Restore it now.
|
|
|
|
Fixes: #18349
|
|
---
|
|
Modules/FindMPI.cmake | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
|
|
index 75c4441..bfcd876 100644
|
|
--- a/Modules/FindMPI.cmake
|
|
+++ b/Modules/FindMPI.cmake
|
|
@@ -1680,7 +1680,7 @@ foreach(LANG IN ITEMS C CXX Fortran)
|
|
set(MPI_${LANG}_INCLUDE_PATH "${MPI_${LANG}_INCLUDE_DIRS}")
|
|
unset(MPI_${LANG}_COMPILE_FLAGS)
|
|
if(MPI_${LANG}_COMPILE_OPTIONS)
|
|
- set(MPI_${LANG}_COMPILE_FLAGS "${MPI_${LANG}_COMPILE_OPTIONS}")
|
|
+ list(JOIN MPI_${LANG}_COMPILE_FLAGS " " MPI_${LANG}_COMPILE_OPTIONS)
|
|
endif()
|
|
if(MPI_${LANG}_COMPILE_DEFINITIONS)
|
|
foreach(_MPI_DEF IN LISTS MPI_${LANG}_COMPILE_DEFINITIONS)
|
|
--
|
|
1.8.3.1
|
|
|