Update all find scripts split definitions from includes

cmake/modules/DuneBoost.cmake

@@ -14,9 +14,9 @@ set(HAVE_DUNE_BOOST ${Boost_FOUND})
 
 #add all boost realted flags to ALL_PKG_FLAGS, this must happen regardless of a target using add_dune_boost_flags
 if(HAVE_DUNE_BOOST)
-  set_property(GLOBAL APPEND PROPERTY ALL_PKG_FLAGS "-DENABLE_BOOST=1")
+  set_property(GLOBAL APPEND PROPERTY ALL_PKG_DEFS "ENABLE_BOOST=1")
   foreach(dir ${Boost_INCLUDE_DIRS})
-    set_property(GLOBAL APPEND PROPERTY ALL_PKG_FLAGS "-I${dir}")
+    set_property(GLOBAL APPEND PROPERTY ALL_PKG_INCS "${dir}")
   endforeach()
 endif()
 

cmake/modules/DuneMPI.cmake

@@ -34,10 +34,10 @@ if(MPI_C_FOUND)
   set(MPI_DUNE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} ${MPI_C_LIBRARIES} CACHE STRING
     "Libraries used by DUNE when linking MPI programs")
 
-  set_property(GLOBAL APPEND PROPERTY ALL_PKG_FLAGS "-DENABLE_MPI=1 -DMPICH_SKIP_MPICXX -DMPIPP_H")
-  foreach(dir ${MPI_DUNE_INCLUDE_PATH})
-    set_property(GLOBAL APPEND PROPERTY ALL_PKG_FLAGS "-I${dir}")
-  endforeach()
+  # TODO check on where to position this exactly, doesnt look completely thought through
+  set_property(GLOBAL APPEND PROPERTY ALL_PKG_DEFS "ENABLE_MPI=1;MPICH_SKIP_MPICXX;MPIPP_H")
+  set_property(GLOBAL APPEND PROPERTY ALL_PKG_INCS "${MPI_DUNE_INCLUDE_PATH}")
+  set_property(GLOBAL APPEND PROPERTY ALL_PKG_LIBS "${MPI_DUNE_LIBRARIES}")
 
   # Check whether the MPI-2 standard is supported
   include(CMakePushCheckState)

cmake/modules/FindGMP.cmake

@@ -84,9 +84,7 @@ set(HAVE_GMP ${GMP_FOUND})
 
 #add all GMP related flags to ALL_PKG_FLAGS, this must happen regardless of a target using add_dune_gmp_flags
 if(HAVE_GMP)
-  set_property(GLOBAL APPEND PROPERTY ALL_PKG_FLAGS "-DENABLE_GMP=1")
-  foreach(dir ${GMP_INCLUDE_DIR})
-    set_property(GLOBAL APPEND PROPERTY ALL_PKG_FLAGS "-I${dir}")
-  endforeach()
+  set_property(GLOBAL APPEND PROPERTY ALL_PKG_DEFS "ENABLE_GMP=1")
+  set_property(GLOBAL APPEND PROPERTY ALL_PKG_INCS "${GMP_INCLUDE_DIR}")
   set_property(GLOBAL APPEND PROPERTY ALL_PKG_LIBS "${GMP_LIB}" "${GMPXX_LIB}")
 endif()

cmake/modules/FindMETIS.cmake

@@ -89,8 +89,6 @@ endif(METIS_FOUND)
 
 #add all metis related flags to ALL_PKG_FLAGS, this must happen regardless of a target using add_dune_metis_flags
 if(METIS_FOUND)
-  foreach(dir ${METIS_INCLUDE_DIRS})
-    set_property(GLOBAL APPEND PROPERTY ALL_PKG_FLAGS "-I${dir}")
-  endforeach()
+  set_property(GLOBAL APPEND PROPERTY ALL_PKG_INCS "${METIS_INCLUDE_DIRS}")
   set_property(GLOBAL APPEND PROPERTY ALL_PKG_LIBS "${METIS_LIBRARIES}")
 endif()

cmake/modules/FindParMETIS.cmake

@@ -100,8 +100,7 @@ endif(PARMETIS_FOUND)
 
 #add all parmetis related flags to ALL_PKG_FLAGS, this must happen regardless of a target using add_dune_parmetis_flags
 if(PARMETIS_FOUND)
-  foreach(dir ${PARMETIS_INCLUDE_DIRS})
-    set_property(GLOBAL APPEND PROPERTY ALL_PKG_FLAGS "-I${dir}")
-  endforeach()
+  set_property(GLOBAL APPEND PROPERTY ALL_PKG_INCS "${PARMETIS_INCLUDE_DIRS}")
   set_property(GLOBAL APPEND PROPERTY ALL_PKG_LIBS "${PARMETIS_LIBRARIES}")
+  set_property(GLOBAL APPEND PROPERTY ALL_PKG_DEFS "ENABLE_PARMETIS=1")
 endif()

cmake/modules/FindUMFPack.cmake

@@ -96,9 +96,7 @@ set(HAVE_UMFPACK ${UMFPACK_FOUND})
 
 #add all umfpack related flags to ALL_PKG_FLAGS, this must happen regardless of a target using add_dune_umfpack_flags
 if(UMFPACK_FOUND)
-  set_property(GLOBAL APPEND PROPERTY ALL_PKG_FLAGS "${UMFPACK_DUNE_COMPILE_FLAGS}")
-  foreach(dir "${UMFPACK_INCLUDE_DIRS}")
-    set_property(GLOBAL APPEND PROPERTY ALL_PKG_FLAGS "-I${dir}")
-  endforeach()
+  set_property(GLOBAL APPEND PROPERTY ALL_PKG_INCS "${UMFPACK_INCLUDE_DIRS}")
   set_property(GLOBAL APPEND PROPERTY ALL_PKG_LIBS "${UMFPACK_LIBRARIES}")
+  set_property(GLOBAL APPEND PROPERTY ALL_PKG_DEFS "ENABLE_UMFPACK=1")
 endif()