Include bundled include directories as CMake SYSTEM paths

diff --git a/bundled/CMakeLists.txt b/bundled/CMakeLists.txt
index c922570200a10a40b597e1c3e14aa1498245e652..71d4aaceb0194d5ceb0969d87dfbb586d94d0968 100644 (file)
--- a/bundled/CMakeLists.txt
+++ b/bundled/CMakeLists.txt
@@ -19,11 +19,6 @@
 
 message(STATUS "Setting up bundled features")
 
-include_directories(
-  ${DEAL_II_BUNDLED_INCLUDE_DIRS}
-  ${DEAL_II_INCLUDE_DIRS}
-  )
-
 if(DEAL_II_FEATURE_BOOST_BUNDLED_CONFIGURED)
   add_subdirectory(${BOOST_FOLDER}/libs/serialization/src)
   add_subdirectory(${BOOST_FOLDER}/libs/system/src)

diff --git a/cmake/macros/macro_deal_ii_add_library.cmake b/cmake/macros/macro_deal_ii_add_library.cmake
index 87a9fd9fca506fa081700dbfaa007e67d3c75bae..e5e3f2cc19255943e05c0d539f4c79c1181bbb80 100644 (file)
--- a/cmake/macros/macro_deal_ii_add_library.cmake
+++ b/cmake/macros/macro_deal_ii_add_library.cmake
@@ -48,6 +48,11 @@ macro(deal_ii_add_library _library)
       PUBLIC ${DEAL_II_DEFINITIONS} ${DEAL_II_DEFINITIONS_${_build}}
       )
 
+    target_include_directories(${_library}_${_build_lowercase}
+      PUBLIC ${DEAL_II_INCLUDE_DIRS})
+    target_include_directories(${_library}_${_build_lowercase}
+      SYSTEM PUBLIC ${DEAL_II_BUNDLED_INCLUDE_DIRS})
+
     set_property(GLOBAL APPEND PROPERTY DEAL_II_OBJECTS_${_build}
       "$<TARGET_OBJECTS:${_library}_${_build_lowercase}>"
       )

diff --git a/cmake/macros/macro_insource_setup_target.cmake b/cmake/macros/macro_insource_setup_target.cmake
index 556fecaf0d3ed8d5e19475a8655c038e1b2acd97..e765cb5e6756c4766ee6b299232e8fbeff287c00 100644 (file)
--- a/cmake/macros/macro_insource_setup_target.cmake
+++ b/cmake/macros/macro_insource_setup_target.cmake
@@ -36,9 +36,10 @@ function(insource_setup_target _target _build)
     PRIVATE
       "${CMAKE_BINARY_DIR}/include"
       "${CMAKE_SOURCE_DIR}/include"
-      ${DEAL_II_BUNDLED_INCLUDE_DIRS}
     )
-  target_include_directories(${_target} SYSTEM PRIVATE ${DEAL_II_INCLUDE_DIRS})
+  target_include_directories(${_target}
+    SYSTEM PRIVATE ${DEAL_II_INCLUDE_DIRS} ${DEAL_II_BUNDLED_INCLUDE_DIRS}
+    )
 
   set(_flags "${DEAL_II_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${_build}}")
   separate_arguments(_flags)

diff --git a/contrib/python-bindings/source/CMakeLists.txt b/contrib/python-bindings/source/CMakeLists.txt
index 1f04fdbaff4f0600405dc31d9bd2d7e5d14fe4a1..ca1fd416df78d7da5900912c2b33071c41e6e7d5 100644 (file)
--- a/contrib/python-bindings/source/CMakeLists.txt
+++ b/contrib/python-bindings/source/CMakeLists.txt
@@ -16,10 +16,10 @@
 include_directories(
   ${CMAKE_BINARY_DIR}/include/
   ${CMAKE_SOURCE_DIR}/include/
-  ${DEAL_II_BUNDLED_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/contrib/python-bindings/include/
   SYSTEM
   ${DEAL_II_INCLUDE_DIRS}
+  ${DEAL_II_BUNDLED_INCLUDE_DIRS}
   )
 
 #

diff --git a/include/deal.II/arborx/bvh.h b/include/deal.II/arborx/bvh.h
index 8cc4d6e053800169be37dc68b686e1717eb9acb7..dbd895bb4f29eb224aeb5fc41679f5fe6e360e7a 100644 (file)
--- a/include/deal.II/arborx/bvh.h
+++ b/include/deal.II/arborx/bvh.h
@@ -22,10 +22,7 @@
 #  include <deal.II/arborx/access_traits.h>
 
 #  include <ArborX_LinearBVH.hpp>
-
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Kokkos_Core.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/include/deal.II/arborx/distributed_tree.h b/include/deal.II/arborx/distributed_tree.h
index 5e5c5b4ff0238eafb5a0ce41499906efe0d4f4c8..2dba72b54813bd2448c267453ea27302bd9b33fa 100644 (file)
--- a/include/deal.II/arborx/distributed_tree.h
+++ b/include/deal.II/arborx/distributed_tree.h
@@ -22,9 +22,7 @@
 #  include <deal.II/arborx/access_traits.h>
 
 #  include <ArborX_DistributedTree.hpp>
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Kokkos_Core.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/include/deal.II/base/memory_space.h b/include/deal.II/base/memory_space.h
index 2a42940dee240b4beef6e6d568d493f1e1cf15c8..91c87d9f8ff72da2552c10b89b685ba4c00bbf34 100644 (file)
--- a/include/deal.II/base/memory_space.h
+++ b/include/deal.II/base/memory_space.h
@@ -19,9 +19,7 @@
 
 #include <deal.II/base/config.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <Kokkos_Core.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/include/deal.II/base/memory_space_data.h b/include/deal.II/base/memory_space_data.h
index f30bbb32a1a9067679b68ff9c471035dfef5d4fb..827500bdcbadbe9b32eebf5c162640ed52c74806 100644 (file)
--- a/include/deal.II/base/memory_space_data.h
+++ b/include/deal.II/base/memory_space_data.h
@@ -23,9 +23,7 @@
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/kokkos.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <Kokkos_Core.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <functional>
 #include <memory>

diff --git a/tests/quick_tests/kokkos.cc b/tests/quick_tests/kokkos.cc
index 8bce488af238276fa65137863e631a1e4879dc49..28f190b12906da4aee50ea83fb269a8df860c2c4 100644 (file)
--- a/tests/quick_tests/kokkos.cc
+++ b/tests/quick_tests/kokkos.cc
@@ -1,8 +1,7 @@
 
 #include <deal.II/base/config.h>
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
+
 #include <Kokkos_Core.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 struct FillFunctor
 {