From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Wed, 25 Oct 2017 19:00:31 +0000 (+0200)
Subject: Relax requirements for external BOOST for DEAL_WITH_ZLIB=OFF
X-Git-Tag: v9.0.0-rc1~871^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccd6fa7281417f42dc3e358b3e579d8410cb0c9c;p=dealii.git

Relax requirements for external BOOST for DEAL_WITH_ZLIB=OFF
---

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()