From 61392217cf9b60f8bc2ee0016071fcc56b0cea46 Mon Sep 17 00:00:00 2001 From: Jean-Paul Pelteret Date: Thu, 26 Apr 2018 19:45:15 +0200 Subject: [PATCH] CMake: Add missing boost headers to AdolC module --- cmake/modules/FindADOLC.cmake | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cmake/modules/FindADOLC.cmake b/cmake/modules/FindADOLC.cmake index 6702e403e8..f0ff3745c8 100644 --- a/cmake/modules/FindADOLC.cmake +++ b/cmake/modules/FindADOLC.cmake @@ -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 ) -- 2.39.5