]> https://gitweb.dealii.org/ - dealii.git/commitdiff
CMake: Make Adol-C check for boost pool more specific. 6371/head
authorJean-Paul Pelteret <jppelteret@gmail.com>
Sat, 28 Apr 2018 06:44:30 +0000 (08:44 +0200)
committerJean-Paul Pelteret <jppelteret@gmail.com>
Sat, 28 Apr 2018 06:44:30 +0000 (08:44 +0200)
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

cmake/modules/FindADOLC.cmake

index f0ff3745c84d13d646c742fb63ff0ac92b1323c7..65e6dfb57ddcf8a6c99048a9fe725b8eae5a6685 100644 (file)
@@ -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)

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.