From d1ed71376b9d7faca6e1321ea745f0e2d848df00 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Thu, 18 Apr 2019 21:01:36 +0200 Subject: [PATCH] Fix configuring with external Boost-1.70.0 --- cmake/modules/FindBOOST.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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) # -- 2.39.5