Skip to content
Snippets Groups Projects
Commit 6aff7c2d authored by Ansgar Burchardt's avatar Ansgar Burchardt
Browse files

Merge branch 'fix/#34-pthread-from-FindMPI' into 'master'

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

Closes #34

See merge request staging/dune-uggrid!88

(cherry picked from commit 0c45c77e)

9f1feada [cmake] Fix compatibility issue with CMake 3.10 leadig to -D-pthread
parent 9f826b59
No related branches found
No related tags found
1 merge request!107Merge branch 'fix/#34-pthread-from-FindMPI' into 'master'
Pipeline #
...@@ -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()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment