From 8e9a221009230396a2e19b6722aa12c01fd046df Mon Sep 17 00:00:00 2001 From: Joachim Protze Date: Tue, 16 Mar 2021 14:20:21 +0100 Subject: [PATCH 1/2] Pass C11 flag in order to fix OpenMPI 4.0 behavior --- wrap-config.cmake.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wrap-config.cmake.in b/wrap-config.cmake.in index 9df62d8..5bbb73e 100644 --- a/wrap-config.cmake.in +++ b/wrap-config.cmake.in @@ -64,9 +64,9 @@ if (NOT Wrap_CONFIG_LOADED) set(wrap_includes ${wrap_includes} -I ${include}) endforeach() endif() - set(wrap_compiler -c ${CMAKE_C_COMPILER}) + set(wrap_compiler -c "${CMAKE_C_COMPILER} @C11_FLAGS@") if (MPI_C_COMPILER) - set(wrap_compiler -c ${MPI_C_COMPILER}) + set(wrap_compiler -c "${MPI_C_COMPILER} @C11_FLAGS@") endif() if (ARGN) From d22e13fbc1f5a92c5f675db03ff153caf67295e3 Mon Sep 17 00:00:00 2001 From: Joachim Protze Date: Mon, 5 Jul 2021 18:38:04 +0200 Subject: [PATCH 2/2] Bump CMake minimum required version since older than 2.8.12 is deprecated --- CMakeLists.txt | 2 +- examples/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0af8790..bdade26 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ # All rights reserved - please read information in "LICENCSE" project(wrap) -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 2.8.12) # @authors Todd Gamblin, Tobias Hilbrich, Martin Schulz # @date 2011-05-01 diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index b235149..3d96f00 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,5 +1,5 @@ project(wrap-examples) -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 2.8.12) find_package(MPI REQUIRED) include_directories(${MPI_C_INCLUDE_PATH})