summaryrefslogtreecommitdiff
path: root/Modules
diff options
context:
space:
mode:
authorDongHun Kwak <dh0128.kwak@samsung.com>2021-10-08 09:13:29 +0900
committerDongHun Kwak <dh0128.kwak@samsung.com>2021-10-08 09:13:29 +0900
commit0093b6749408dc1fa6c0578865555750171940a9 (patch)
tree150446d9eff60021385a36d07f0a92c9d3c47851 /Modules
parentd3ab5eb53d4ef4c187524c2804aa6e0a6406da89 (diff)
downloadcmake-0093b6749408dc1fa6c0578865555750171940a9.tar.gz
cmake-0093b6749408dc1fa6c0578865555750171940a9.tar.bz2
cmake-0093b6749408dc1fa6c0578865555750171940a9.zip
Imported Upstream version 3.12.3upstream/3.12.3
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindDoxygen.cmake5
-rw-r--r--Modules/FindMPI.cmake2
2 files changed, 6 insertions, 1 deletions
diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake
index 945ee0ed1..2ed944980 100644
--- a/Modules/FindDoxygen.cmake
+++ b/Modules/FindDoxygen.cmake
@@ -370,6 +370,9 @@ Deprecated Hint Variables
#]=======================================================================]
+cmake_policy(PUSH)
+cmake_policy(SET CMP0057 NEW) # if IN_LIST
+
# For backwards compatibility support
if(Doxygen_FIND_QUIETLY)
set(DOXYGEN_FIND_QUIETLY TRUE)
@@ -1108,3 +1111,5 @@ doxygen_add_docs() for target ${targetName}")
)
endfunction()
+
+cmake_policy(POP)
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 75c4441ca..bfcd87660 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)