From ec7c805c2e460dde1bc59d47510a944a1ce896c7 Mon Sep 17 00:00:00 2001
From: Markus Blatt <mblatt@dune-project.org>
Date: Tue, 21 Aug 2012 15:38:44 +0000
Subject: [PATCH] Added an OBJECT flag to add_dune_mpi_flags to support object
libraries.
[[Imported from SVN: r6918]]
---
cmake/modules/DuneMPI.cmake | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmake/modules/DuneMPI.cmake b/cmake/modules/DuneMPI.cmake
index 52c9afdce..3d7f1107b 100644
--- a/cmake/modules/DuneMPI.cmake
+++ b/cmake/modules/DuneMPI.cmake
@@ -47,7 +47,7 @@ endif(MPI_FOUND)
# adds MPI flags to the targets
function(add_dune_mpi_flags)
- cmake_parse_arguments(ADD_MPI "SOURCE_ONLY" "" "" ${ARGN})
+ cmake_parse_arguments(ADD_MPI "SOURCE_ONLY;OBJECT" "" "" ${ARGN})
if(ADD_MPI_SOURCE_ONLY)
set(_prefix SOURCE)
else()
@@ -57,11 +57,11 @@ function(add_dune_mpi_flags)
set_property(${_prefix} ${ADD_MPI_UNPARSED_ARGUMENTS} APPEND PROPERTY COMPILE_FLAGS ${MPI_DUNE_COMPILE_FLAGS})
set_property(${_prefix} ${ADD_MPI_UNPARSED_ARGUMENTS} APPEND PROPERTY COMPILE_DEFINITIONS ENABLE_MPI=1
MPICH_SKIP_MPICXX MPIPP_H)
- if(NOT ADD_MPI_SOURCE_ONLY)
+ if(NOT (ADD_MPI_SOURCE_ONLY OR ADD_MPI_OBJECT))
set_property(${_prefix} ${ADD_MPI_UNPARSED_ARGUMENTS} APPEND PROPERTY LINK_FLAGS ${MPI_DUNE_LINK_FLAGS})
foreach(target ${ADD_MPI_UNPARSED_ARGUMENTS})
target_link_libraries(${target} ${MPI_DUNE_LIBRARIES})
endforeach(target ${ADD_MPI_UNPARSED_ARGUMENTS})
- endif(NOT ADD_MPI_SOURCE_ONLY)
+ endif(NOT (ADD_MPI_SOURCE_ONLY OR ADD_MPI_OBJECT))
endif(MPI_FOUND)
endfunction(add_dune_mpi_flags)
--
GitLab