CMakeLists.txt

@@ -19,12 +19,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(dunecurvedgeometry INTERFACE
   EXPORT_NAME CurvedGeometry
   LINK_LIBRARIES ${DUNE_LIBS})
 
+if (dune-common_VERSION VERSION_GREATER_EQUAL 2.11)
+  # set include directories for dunecurvedgeometry library
+  dune_default_include_directories(dunecurvedgeometry INTERFACE)
+endif()
+
 add_subdirectory(src)
 add_subdirectory(dune)
 add_subdirectory(doc)

dune/curvedgeometry/test/CMakeLists.txt

+# link tests to Dune::CurvedGeometry by default
+link_libraries(Dune::CurvedGeometry)
+
 dune_add_test(NAME test-curvedgeometry-double
               SOURCES test-curvedgeometry.cc
-              LINK_LIBRARIES ${DUNE_LIBS}
               COMPILE_DEFINITIONS USE_FLOAT128=0
               CMAKE_GUARD dune-localfunctions_FOUND)
 
 dune_add_test(NAME test-curvedgeometry-float128
               SOURCES test-curvedgeometry.cc
-              LINK_LIBRARIES ${DUNE_LIBS}
               COMPILE_DEFINITIONS USE_FLOAT128=1
               CMAKE_GUARD
                 dune-localfunctions_FOUND
                 HAVE_QUADMATH)
-
+add_dune_quadmath_flags(test-curvedgeometry-float128)
 
 dune_add_test(NAME test-parametrizedgeometry-double
               SOURCES test-parametrizedgeometry.cc
-              LINK_LIBRARIES ${DUNE_LIBS}
               COMPILE_DEFINITIONS USE_FLOAT128=0
               CMAKE_GUARD dune-localfunctions_FOUND)
 
 dune_add_test(NAME test-parametrizedgeometry-float128
               SOURCES test-parametrizedgeometry.cc
-              LINK_LIBRARIES ${DUNE_LIBS}
               COMPILE_DEFINITIONS USE_FLOAT128=1
               CMAKE_GUARD
                 dune-localfunctions_FOUND
                 HAVE_QUADMATH)
-
+add_dune_quadmath_flags(test-parametrizedgeometry-float128)
 
 dune_add_test(NAME test-localfunctiongeometry-double
               SOURCES test-localfunctiongeometry.cc
-              LINK_LIBRARIES ${DUNE_LIBS}
               COMPILE_DEFINITIONS USE_FLOAT128=0)
 
 dune_add_test(NAME test-localfunctiongeometry-float128
               SOURCES test-localfunctiongeometry.cc
-              LINK_LIBRARIES ${DUNE_LIBS}
               COMPILE_DEFINITIONS USE_FLOAT128=1
               CMAKE_GUARD HAVE_QUADMATH)
+add_dune_quadmath_flags(test-localfunctiongeometry-float128)
 
 
 dune_add_test(SOURCES test-globalparametrization.cc
-              LINK_LIBRARIES ${DUNE_LIBS}
               CMAKE_GUARD dune-localfunctions_FOUND)

dune/localfunctions/lagrange/test/CMakeLists.txt

 dune_add_test(SOURCES test-lfecache.cc
-              LINK_LIBRARIES ${DUNE_LIBS}
+              LINK_LIBRARIES Dune::CurvedGeometry
               CMAKE_GUARD dune-localfunctions_FOUND)
\ No newline at end of file