]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Revert changes other than for docs 18120/head
authorDaniel Arndt <arndtd@ornl.gov>
Wed, 12 Feb 2025 13:35:43 +0000 (08:35 -0500)
committerDaniel Arndt <arndtd@ornl.gov>
Wed, 12 Feb 2025 13:35:43 +0000 (08:35 -0500)
cmake/macros/macro_insource_setup_target.cmake
cmake/macros/macro_populate_target_properties.cmake
contrib/python-bindings/source/CMakeLists.txt

index 9ffc4dcd31545e69cf23b12437dbe5935ab9580e..3359f06c570006e1308e52a59a09ac34bccba987 100644 (file)
@@ -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})
index c43865cbf1c3d684790744dd13dda832fa4946ff..bb5295ca6e706137f71a07cf8dd8b05f6723251b 100644 (file)
@@ -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
index 69c3671689866f14c68c187969e25c9eae59084c..413402151161cf80310d07b0b8c00e6eb6207e24 100644 (file)
@@ -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}
   )
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.