Commit 9f1feada authored by Christoph Grüninger's avatar Christoph Grüninger Committed by Christoph Grüninger

[cmake] Fix compatibility issue with CMake 3.10 leadig to -D-pthread

CMake 3.10 overhauled FindMPI.cmake. Now -pthread ends in various
MPI-related variables and from there in MPI_DUNE_COMPILE_FLAGS. With
COMPILE_DEFINITIONS -pthread got the prefix -D.
Changed to COMPILE_OPTIONS which does not add -D to the passed flags.

Fixes #34Signed-off-by: Christoph Grüninger's avatarChristoph Grüninger <christoph.grueninger@iws.uni-stuttgart.de>
parent 66e393e8
Pipeline #6387 passed with stage
in 4 minutes and 50 seconds
...@@ -3,7 +3,7 @@ if(MPI_C_FOUND) ...@@ -3,7 +3,7 @@ if(MPI_C_FOUND)
# Maybe dune-common should export them? # Maybe dune-common should export them?
add_definitions(-DENABLE_MPI=1 -DMPICH_SKIP_MPICXX -DMPIPP_H) add_definitions(-DENABLE_MPI=1 -DMPICH_SKIP_MPICXX -DMPIPP_H)
include_directories("${MPI_DUNE_INCLUDE_PATH}") include_directories("${MPI_DUNE_INCLUDE_PATH}")
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS ${MPI_DUNE_COMPILE_FLAGS}) set_property(DIRECTORY APPEND PROPERTY COMPILE_OPTIONS "${MPI_DUNE_COMPILE_FLAGS}")
ug_add_dim_libs(parallel OBJECT initparallel.cc) # OBJECT_DIM_LIBS ddd dddif) ug_add_dim_libs(parallel OBJECT initparallel.cc) # OBJECT_DIM_LIBS ddd dddif)
endif() endif()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment