Merge branch origin/release-2020 into master

[alexxy/gromacs.git] / cmake / gmxTestMPI_IN_PLACE.cmake

diff --git a/cmake/gmxTestMPI_IN_PLACE.cmake b/cmake/gmxTestMPI_IN_PLACE.cmake
index ac33df22a2979cca3b1c1821a47be7c4c18bb9f4..54cdb1046ddf90d31dcace41b9592f42c84e41ec 100644 (file)
--- a/cmake/gmxTestMPI_IN_PLACE.cmake
+++ b/cmake/gmxTestMPI_IN_PLACE.cmake
@@ -45,7 +45,13 @@ MACRO(GMX_TEST_MPI_IN_PLACE VARIABLE)
   if(NOT DEFINED MPI_IN_PLACE_COMPILE_OK)
     MESSAGE(STATUS "Checking for MPI_IN_PLACE")
 
-    set(CMAKE_REQUIRED_FLAGS ${MPI_COMPILE_FLAGS})
+    if(CMAKE_VERSION VERSION_LESS 3.12)
+      foreach(_FLAG ${MPI_COMPILE_FLAGS})
+        set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${_FLAG}")
+      endforeach()
+    else()
+      list(JOIN MPI_COMPILE_FLAGS " " CMAKE_REQUIRED_FLAGS)
+    endif()
     set(CMAKE_REQUIRED_INCLUDES ${MPI_INCLUDE_PATH})
     set(CMAKE_REQUIRED_LIBRARIES ${MPI_LIBRARIES})
     check_cxx_source_compiles(