Set up default include directories on module target

CMakeLists.txt

@@ -18,6 +18,9 @@ list(APPEND CMAKE_MODULE_PATH ${dune-common_MODULE_PATH}
 #include the dune macros
 include(DuneMacros)
 
+# deactivate global include-directories
+dune_policy(SET DP_DEFAULT_INCLUDE_DIRS NEW)
+
 # start a dune project with information from dune.module
 dune_project()
 
@@ -25,6 +28,9 @@ dune_project()
 dune_add_library(dunegrid EXPORT_NAME Grid)
 target_link_libraries(dunegrid PUBLIC ${DUNE_LIBS})
 
+# set include directories to target
+dune_default_include_directories(dunegrid PUBLIC)
+
 # create a dune library for the albertagrid
 if(Alberta_FOUND)
   foreach(_dim ${ALBERTA_WORLD_DIMS})

doc/recipes/CMakeLists.txt

@@ -2,5 +2,5 @@
 # SPDX-License-Identifier: LicenseRef-GPL-2.0-only-with-DUNE-exception
 
 
-dune_add_test(SOURCES recipe-iterate-over-grid.cc)
-dune_add_test(SOURCES recipe-integration.cc)
+dune_add_test(SOURCES recipe-iterate-over-grid.cc LINK_LIBRARIES Dune::Grid)
+dune_add_test(SOURCES recipe-integration.cc LINK_LIBRARIES Dune::Grid)

dune/grid/albertagrid/test/CMakeLists.txt

@@ -3,7 +3,7 @@
 
 if(Alberta_FOUND)
   add_executable(test-alberta3d-refine test-alberta3d-refine.cc)
-  target_link_libraries(test-alberta3d-refine PRIVATE dunegrid)
+  target_link_libraries(test-alberta3d-refine PRIVATE Dune::Grid)
   add_dune_alberta_flags(test-alberta3d-refine WORLDDIM 3)
   dune_add_test(TARGET test-alberta3d-refine)
 endif()

dune/grid/common/test/CMakeLists.txt

 # SPDX-FileCopyrightText: Copyright © DUNE Project contributors, see file LICENSE.md in module root
 # SPDX-License-Identifier: LicenseRef-GPL-2.0-only-with-DUNE-exception
 
-dune_add_test(SOURCES scsgmappertest.cc LINK_LIBRARIES dunegrid)
-dune_add_test(SOURCES mcmgmappertest.cc LINK_LIBRARIES dunegrid)
+# Link all test targets in this directory against Dune::Grid
+link_libraries(Dune::Grid)
+
+dune_add_test(SOURCES scsgmappertest.cc)
+dune_add_test(SOURCES mcmgmappertest.cc)

dune/grid/io/file/dgfparser/test/CMakeLists.txt

 # SPDX-FileCopyrightText: Copyright © DUNE Project contributors, see file LICENSE.md in module root
 # SPDX-License-Identifier: LicenseRef-GPL-2.0-only-with-DUNE-exception
 
+# Link all test targets in this directory against Dune::Grid
+link_libraries(Dune::Grid)
+
 dune_add_test(NAME test-dgf-yasp
               SOURCES test-dgf-yasp.cc
-              LINK_LIBRARIES dunegrid
               COMPILE_DEFINITIONS DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\"
              )
 
 dune_add_test(NAME test-dgf-yasp-offset
               SOURCES test-dgf-yasp.cc
-              LINK_LIBRARIES dunegrid
               COMPILE_DEFINITIONS DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\"
                                   TESTCOORDINATES
               CMD_ARGS ${PROJECT_SOURCE_DIR}/doc/grids/dgf/test2d_offset.dgf)
 
 dune_add_test(NAME test-dgf-oned
               SOURCES test-dgf-oned.cc
-              LINK_LIBRARIES dunegrid
               COMPILE_DEFINITIONS DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\"
              )
 
 if(Alberta_FOUND)
   add_executable(test-dgf-alberta test-dgf-alberta.cc)
-  target_link_libraries(test-dgf-alberta PRIVATE dunegrid)
   add_dune_alberta_flags(test-dgf-alberta WORLDDIM 2)
   target_compile_definitions(test-dgf-alberta PUBLIC
     DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\")
@@ -31,12 +30,10 @@ endif()
 
 dune_add_test(NAME test-dgf-ug
               SOURCES test-dgf-ug.cc
-              LINK_LIBRARIES dunegrid
               COMPILE_DEFINITIONS DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\"
               CMAKE_GUARD dune-uggrid_FOUND)
 
 dune_add_test(NAME test-dgf-gmsh-ug
               SOURCES test-dgf-ug.cc
-              LINK_LIBRARIES dunegrid
               COMPILE_DEFINITIONS DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\" DGFTEST_USE_GMSH=1
               CMAKE_GUARD dune-uggrid_FOUND)

dune/grid/io/file/test/CMakeLists.txt

@@ -7,6 +7,9 @@
 # be done more nicely.
 #
 
+# Link all test targets in this directory against Dune::Grid
+link_libraries(Dune::Grid)
+
 dune_add_test(SOURCES conformvolumevtktest.cc)
 
 dune_add_test(SOURCES gnuplottest.cc)
@@ -34,33 +37,28 @@ if(TARGET Python3::Python)
 endif()
 
 dune_add_test(SOURCES starcdreadertest.cc
-              LINK_LIBRARIES dunegrid
               COMPILE_DEFINITIONS DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\"
               CMAKE_GUARD dune-uggrid_FOUND)
 
 # the gmsh tests
 dune_add_test(NAME gmshtest-onedgrid
               SOURCES gmshtest.cc
-              LINK_LIBRARIES dunegrid
               COMPILE_DEFINITIONS GMSH_ONEDGRID
                                   DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\")
 
 dune_add_test(NAME gmshtest-uggrid
               SOURCES gmshtest.cc
-              LINK_LIBRARIES dunegrid
               COMPILE_DEFINITIONS GMSH_UGGRID
                                   DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\"
               CMAKE_GUARD dune-uggrid_FOUND)
 
 if(Alberta_FOUND)
   add_executable(gmshtest-alberta2d gmshtest.cc)
-  target_link_libraries(gmshtest-alberta2d PRIVATE dunegrid)
   add_dune_alberta_flags(gmshtest-alberta2d WORLDDIM 2)
   target_compile_definitions(gmshtest-alberta2d PUBLIC GMSH_ALBERTAGRID DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\")
   dune_add_test(TARGET gmshtest-alberta2d)
 
   add_executable(gmshtest-alberta3d gmshtest.cc)
-  target_link_libraries(gmshtest-alberta3d PRIVATE dunegrid)
   add_dune_alberta_flags(gmshtest-alberta3d WORLDDIM 3)
   target_compile_definitions(gmshtest-alberta3d PUBLIC GMSH_ALBERTAGRID DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\")
   dune_add_test(TARGET gmshtest-alberta3d)

dune/grid/test/CMakeLists.txt

@@ -3,13 +3,15 @@
 
 add_subdirectory(yasp)
 
+# Link all test targets in this directory against Dune::Grid
+link_libraries(Dune::Grid)
+
 dune_add_test(SOURCES test-concepts.cc)
 
 dune_add_test(SOURCES geometrygrid-coordfunction-copyconstructor.cc)
 
 dune_add_test(NAME test-geogrid-yaspgrid
               SOURCES test-geogrid.cc
-              LINK_LIBRARIES dunegrid
               COMPILE_DEFINITIONS COORDFUNCTION=IdenticalCoordFunction<double,2>
                                   CACHECOORDFUNCTION=0
                                   DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\"
@@ -17,7 +19,6 @@ dune_add_test(NAME test-geogrid-yaspgrid
 
 dune_add_test(NAME test-geogrid-uggrid
               SOURCES test-geogrid.cc
-              LINK_LIBRARIES dunegrid
               COMPILE_DEFINITIONS COORDFUNCTION=IdenticalCoordFunction<double,2>
                                   CACHECOORDFUNCTION=0
                                   DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\"
@@ -28,8 +29,7 @@ dune_add_test(SOURCES test-gridinfo.cc)
 
 dune_add_test(SOURCES test-identitygrid.cc)
 
-dune_add_test(SOURCES test-oned.cc
-              LINK_LIBRARIES dunegrid)
+dune_add_test(SOURCES test-oned.cc)
 
 dune_add_test(SOURCES test-mcmg-geogrid.cc)
 
@@ -38,22 +38,18 @@ dune_add_test(SOURCES testiteratorranges.cc)
 dune_add_test(SOURCES test-hierarchicsearch.cc)
 
 dune_add_test(SOURCES test-ug.cc
-              LINK_LIBRARIES dunegrid
               COMPILE_DEFINITIONS DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\"
               CMAKE_GUARD dune-uggrid_FOUND)
 
 dune_add_test(SOURCES test-parallel-ug.cc
-              LINK_LIBRARIES dunegrid
               CMAKE_GUARD dune-uggrid_FOUND
               MPI_RANKS 1 2 3 4 8
               TIMEOUT 300)
 
 dune_add_test(SOURCES test-loadbalancing.cc
-              LINK_LIBRARIES dunegrid
               CMAKE_GUARD dune-uggrid_FOUND)
 
 dune_add_test(SOURCES issue-53-uggrid-intersections.cc
-              LINK_LIBRARIES dunegrid
               CMAKE_GUARD dune-uggrid_FOUND)
 
 # The alberta tests are only alibi-ported, until the  grid and world dimension
@@ -64,7 +60,6 @@ if(Alberta_FOUND)
     foreach(GRIDDIM RANGE 1 ${WORLDDIM})
       set(_test test-alberta-${GRIDDIM}-${WORLDDIM})
       add_executable(${_test} EXCLUDE_FROM_ALL test-alberta.cc)
-      target_link_libraries(${_test} PRIVATE dunegrid)
       add_dune_alberta_flags(${_test} WORLDDIM ${WORLDDIM})
       target_compile_definitions(${_test} PUBLIC
         GRIDDIM=${GRIDDIM}

dune/grid/test/yasp/CMakeLists.txt

 # SPDX-FileCopyrightText: Copyright © DUNE Project contributors, see file LICENSE.md in module root
 # SPDX-License-Identifier: LicenseRef-GPL-2.0-only-with-DUNE-exception
 
+# Link all test targets in this directory against Dune::Grid
+link_libraries(Dune::Grid)
+
 dune_add_test(NAME test-yaspgrid-backuprestore-equidistant
               SOURCES test-yaspgrid-backuprestore-equidistant.cc
               MPI_RANKS 1 2

dune/grid/utility/test/CMakeLists.txt

 # SPDX-FileCopyrightText: Copyright © DUNE Project contributors, see file LICENSE.md in module root
 # SPDX-License-Identifier: LicenseRef-GPL-2.0-only-with-DUNE-exception
 
-dune_add_test(SOURCES globalindexsettest.cc
-              LINK_LIBRARIES dunegrid)
+# Link all test targets in this directory against Dune::Grid
+link_libraries(Dune::Grid)
 
-dune_add_test(SOURCES persistentcontainertest.cc
-              LINK_LIBRARIES dunegrid)
+dune_add_test(SOURCES globalindexsettest.cc)
 
-dune_add_test(SOURCES structuredgridfactorytest.cc
-              LINK_LIBRARIES dunegrid)
+dune_add_test(SOURCES persistentcontainertest.cc)
 
-dune_add_test(SOURCES tensorgridfactorytest.cc
-              LINK_LIBRARIES dunegrid)
+dune_add_test(SOURCES structuredgridfactorytest.cc)
 
-dune_add_test(SOURCES vertexordertest.cc
-              LINK_LIBRARIES dunegrid)
+dune_add_test(SOURCES tensorgridfactorytest.cc)
+
+dune_add_test(SOURCES vertexordertest.cc)