From eb89ea1d6ccd489772f48cffd21fe28877d77c0a Mon Sep 17 00:00:00 2001 From: Alexander Peyser <apeyser@users.noreply.github.com> Date: Mon, 19 Dec 2016 17:36:53 +0100 Subject: [PATCH] Add SYSTEM_BGQ in cmake to handle broken mpi header (#131) Compiles on bgq define MPICH2_CONST const for BGQ Add SYSTEM_BGQ to cmake to handle mpi headers --- CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index aa4d627a..106b5d6b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,6 +88,9 @@ if(WITH_CUDA) list(APPEND EXTERNAL_LIBRARIES ${CUDA_LIBRARIES}) endif() +# BGQ systems +set(SYSTEM_BGQ OFF CACHE BOOL "Flags for BlueGene Q") + # MPI support set(WITH_MPI OFF CACHE BOOL "use MPI for distrubuted parallelism") if(WITH_MPI) @@ -97,6 +100,10 @@ if(WITH_MPI) # unfortunate workaround for C++ detection in system mpi.h add_definitions(-DMPICH_SKIP_MPICXX=1 -DOMPI_SKIP_MPICXX=1) set_property(DIRECTORY APPEND_STRING PROPERTY COMPILE_OPTIONS "${MPI_C_COMPILE_FLAGS}") + + if(SYSTEM_BGQ) + add_definitions(-DMPICH2_CONST=const) + endif() endif() # Internal profiler support -- GitLab