Revert changes other than for docs

masterleinad · Feb 12, 2025 · ffaac42 · ffaac42
1 parent cbb33e4
commit ffaac42
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/cmake/macros/macro_insource_setup_target.cmake b/cmake/macros/macro_insource_setup_target.cmake
@@ -47,6 +47,7 @@ function(insource_setup_target _target _build)
       "${CMAKE_SOURCE_DIR}/include"
     SYSTEM PRIVATE
       ${DEAL_II_BUNDLED_INCLUDE_DIRS}
+      ${DEAL_II_INCLUDE_DIRS}
     )
 
   target_link_libraries(${_target} ${DEAL_II_TARGET_NAME}_${_build_lowercase})

diff --git a/cmake/macros/macro_populate_target_properties.cmake b/cmake/macros/macro_populate_target_properties.cmake
@@ -21,6 +21,8 @@
 #   DEAL_II_LIBRARIES DEAL_II_LIBRARIES_<build>
 #   DEAL_II_TARGETS DEAL_II_TARGETS_<build>
 #     - populating the LINK_LIBRARIES target property
+#   DEAL_II_INCLUDE_DIRS
+#     - populating the INCLUDE_DIRECTORIES target property
 #   DEAL_II_DEFINITIONS DEAL_II_DEFINITIONS_<build>
 #     - populating the COMPILE_DEFINITIONS target property
 #   DEAL_II_CXX_FLAGS DEAL_II_CXX_FLAGS_<build>
@@ -48,6 +50,11 @@ function(populate_target_properties _target _build)
 
   set_target_properties(${_target} PROPERTIES LINKER_LANGUAGE "CXX")
 
+  #
+  # Add the contents of ${DEAL_II_INCLUDE_DIRS} as a public interface.
+  #
+  target_include_directories(${_target} SYSTEM ${_visibility} ${DEAL_II_INCLUDE_DIRS})
+
   # Build-directory specific includes:
 
   target_include_directories(${_target} PRIVATE

diff --git a/contrib/python-bindings/source/CMakeLists.txt b/contrib/python-bindings/source/CMakeLists.txt
@@ -17,6 +17,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/include/
   ${CMAKE_SOURCE_DIR}/contrib/python-bindings/include/
   SYSTEM
+  ${DEAL_II_INCLUDE_DIRS}
   ${DEAL_II_BUNDLED_INCLUDE_DIRS}
   )