From: Jean-Paul Pelteret Date: Sat, 28 Apr 2018 06:44:30 +0000 (+0200) Subject: CMake: Make Adol-C check for boost pool more specific. X-Git-Tag: v9.0.0-rc1~59^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abce14224b287dae2bcc2a5166bc5b32a5dc7753;p=dealii.git CMake: Make Adol-C check for boost pool more specific. Apparently there are three states for this preprocessor definition: - Non-existent (i.e. undefined) - Defined and equal to zero (#define USE_BOOST_POOL 0) - Defined and equal to one (#define USE_BOOST_POOL 1) Follow up to #6335 and #6347 --- diff --git a/cmake/modules/FindADOLC.cmake b/cmake/modules/FindADOLC.cmake index f0ff3745c8..65e6dfb57d 100644 --- a/cmake/modules/FindADOLC.cmake +++ b/cmake/modules/FindADOLC.cmake @@ -81,7 +81,7 @@ IF(EXISTS ${ADOLC_SETTINGS_H}) # Check whether ADOL-C is configured to use the Boost pool allocator # FILE(STRINGS "${ADOLC_SETTINGS_H}" ADOLC_BOOST_POOL_STRING - REGEX "#define USE_BOOST_POOL" + REGEX "#define USE_BOOST_POOL 1" ) IF(NOT "${ADOLC_BOOST_POOL_STRING}" STREQUAL "") SET(ADOLC_WITH_BOOST_ALLOCATOR TRUE)