]> https://gitweb.dealii.org/ - dealii.git/commitdiff
CMake: Add missing boost headers to AdolC module 6347/head
authorJean-Paul Pelteret <jppelteret@gmail.com>
Thu, 26 Apr 2018 17:45:15 +0000 (19:45 +0200)
committerJean-Paul Pelteret <jppelteret@gmail.com>
Thu, 26 Apr 2018 17:45:15 +0000 (19:45 +0200)
cmake/modules/FindADOLC.cmake

index 6702e403e815e96ce1c654b7ba5e9bbda498fcf9..f0ff3745c84d13d646c742fb63ff0ac92b1323c7 100644 (file)
@@ -85,9 +85,11 @@ IF(EXISTS ${ADOLC_SETTINGS_H})
     )
   IF(NOT "${ADOLC_BOOST_POOL_STRING}" STREQUAL "")
     SET(ADOLC_WITH_BOOST_ALLOCATOR TRUE)
+    SET(_additional_include_dirs OPTIONAL BOOST_INCLUDE_DIRS)
     SET(_additional_library OPTIONAL BOOST_LIBRARIES)
   ELSE()
     SET(ADOLC_WITH_BOOST_ALLOCATOR FALSE)
+    SET(_additional_include_dirs)
     SET(_additional_library)
   ENDIF()
 ENDIF()
@@ -97,8 +99,12 @@ DEAL_II_PACKAGE_HANDLE(ADOLC
   LIBRARIES
     REQUIRED ADOLC_LIBRARY
     ${_additional_library}
-  INCLUDE_DIRS REQUIRED ADOLC_INCLUDE_DIR
-  USER_INCLUDE_DIRS REQUIRED ADOLC_INCLUDE_DIR
+  INCLUDE_DIRS 
+    REQUIRED ADOLC_INCLUDE_DIR
+    ${_additional_include_dirs}
+  USER_INCLUDE_DIRS 
+    REQUIRED ADOLC_INCLUDE_DIR
+    ${_additional_include_dirs}
   CLEAR ADOLC_INCLUDE_DIR ADOLC_LIBRARY ADOLC_SETTINGS_H
     ADOLC_DOUBLE_CAST_CHECK ADOLC_ADOUBLE_OSTREAM_CHECK # clean up checks in configure_adolc.cmake
   )

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.