From ccd6fa7281417f42dc3e358b3e579d8410cb0c9c Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Wed, 25 Oct 2017 21:00:31 +0200 Subject: [PATCH] Relax requirements for external BOOST for DEAL_WITH_ZLIB=OFF --- cmake/modules/FindBOOST.cmake | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/cmake/modules/FindBOOST.cmake b/cmake/modules/FindBOOST.cmake index 26e9a80c0a..d1f4af936f 100644 --- a/cmake/modules/FindBOOST.cmake +++ b/cmake/modules/FindBOOST.cmake @@ -46,9 +46,15 @@ ENDIF() # temporarily disable ${CMAKE_SOURCE_DIR}/cmake/modules for module lookup LIST(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/) -FIND_PACKAGE(Boost 1.59 COMPONENTS - iostreams serialization system thread - ) +IF(DEAL_II_WITH_ZLIB) + FIND_PACKAGE(Boost 1.59 COMPONENTS + iostreams serialization system thread + ) +ELSE() + FIND_PACKAGE(Boost 1.59 COMPONENTS + serialization system thread + ) +ENDIF() LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/) # @@ -59,7 +65,11 @@ IF(NOT Boost_FOUND AND Boost_USE_STATIC_LIBS) # temporarily disable ${CMAKE_SOURCE_DIR}/cmake/modules for module lookup LIST(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/) - FIND_PACKAGE(Boost 1.59 COMPONENTS iostreams serialization system thread) + IF(DEAL_II_WITH_ZLIB) + FIND_PACKAGE(Boost 1.59 COMPONENTS iostreams serialization system thread) + ELSE() + FIND_PACKAGE(Boost 1.59 COMPONENTS serialization system thread) + ENDIF() LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/) ENDIF() -- 2.39.5