]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Relax requirements for external BOOST for DEAL_WITH_ZLIB=OFF
authorDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Wed, 25 Oct 2017 19:00:31 +0000 (21:00 +0200)
committerDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Wed, 25 Oct 2017 19:05:02 +0000 (21:05 +0200)
cmake/modules/FindBOOST.cmake

index 26e9a80c0a387900f9c221e3bf330da206d47033..d1f4af936f49959b8dfba9e414aa971a003de5a0 100644 (file)
@@ -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()
 

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.