From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Thu, 18 Apr 2019 19:01:36 +0000 (+0200)
Subject: Fix configuring with external Boost-1.70.0
X-Git-Tag: v9.1.0-rc1~197^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1ed71376b9d7faca6e1321ea745f0e2d848df00;p=dealii.git

Fix configuring with external Boost-1.70.0
---

diff --git a/cmake/modules/FindBOOST.cmake b/cmake/modules/FindBOOST.cmake
index 423dcd047e..f640f49e85 100644
--- a/cmake/modules/FindBOOST.cmake
+++ b/cmake/modules/FindBOOST.cmake
@@ -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)
   #