]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Fix configuring with external Boost-1.70.0
authorDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Thu, 18 Apr 2019 19:01:36 +0000 (21:01 +0200)
committerDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Thu, 18 Apr 2019 19:03:54 +0000 (21:03 +0200)
cmake/modules/FindBOOST.cmake

index 423dcd047ee81d12e1a4ebbde9cb96b9a7708258..f640f49e856421a8e95909438bab16b8561e05ea 100644 (file)
@@ -50,6 +50,10 @@ ENDIF()
 
 # temporarily disable ${CMAKE_SOURCE_DIR}/cmake/modules for module lookup
 LIST(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/)
+
+# Workaround a CMake compatibility issue with boost-1.70.0
+SET(Boost_NO_BOOST_CMAKE ON)
+
 IF(DEAL_II_WITH_ZLIB)
   FIND_PACKAGE(Boost ${BOOST_VERSION_REQUIRED} COMPONENTS
     iostreams serialization system thread
@@ -77,7 +81,7 @@ IF(NOT Boost_FOUND AND Boost_USE_STATIC_LIBS)
   LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/)
 ENDIF()
 
-
+UNSET(Boost_NO_BOOST_CMAKE)
 
 IF(Boost_FOUND)
   #

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.