diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e3b5ed0d2361a61365e5345df780c61c34c6fa1..da1d178ccd647ac2ee5cc5abad51dca105b9b8cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,12 +15,22 @@ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules" #include the dune macros include(DuneMacros) +if(dune-common_VERSION VERSION_GREATER_EQUAL 2.11) + # deactivate global include-directories + dune_policy(SET DP_DEFAULT_INCLUDE_DIRS NEW) +endif() + # start a dune project with information from dune.module dune_project() dune_add_library(dunefoamgrid INTERFACE - EXPORT_NAME FoamGrid + EXPORT_NAME FoamGrid LINK_LIBRARIES Dune::Grid) +if(dune-common_VERSION VERSION_GREATER_EQUAL 2.11) + # set include directories for dunefoamgrid library + dune_default_include_directories(dunefoamgrid INTERFACE) +endif() + add_subdirectory(dune) add_subdirectory(doc) add_subdirectory(cmake/modules) diff --git a/dune/foamgrid/test/CMakeLists.txt b/dune/foamgrid/test/CMakeLists.txt index 03b94d5418f50dda363ea1602bc63aba64649ccd..6e27afbc6d16a217a4a494ffb6847ee3bdcc21a1 100644 --- a/dune/foamgrid/test/CMakeLists.txt +++ b/dune/foamgrid/test/CMakeLists.txt @@ -1,6 +1,9 @@ add_definitions(-DDUNE_FOAMGRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\") add_definitions(-DDUNE_GRID_EXAMPLE_GRIDS_PATH=\"${DUNE_GRID_EXAMPLE_GRIDS_PATH}\") +# link tests against Dune::FoamGrid automatically +link_libraries(Dune::FoamGrid) + dune_add_test(SOURCES foamgrid-test.cc) dune_add_test(SOURCES local-refine-test.cc) dune_add_test(SOURCES boundary-segment-test.cc) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 7636bd123a8d5f009d77f15cbdfb36afa2270ce9..21af6cf04be37c79be29bc33867e3682de73f96c 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,2 +1,5 @@ +# link tests against Dune::FoamGrid automatically +link_libraries(Dune::FoamGrid) + dune_add_test(SOURCES elementparametrization.cc) dune_add_test(SOURCES parametrized-refinement.cc)