Configure as far as possible if libz or libbz2 can not be found or configured.

git-svn-id: https://svn.dealii.org/trunk@32104 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/bundled/CMakeLists.txt b/deal.II/bundled/CMakeLists.txt
index 5330907750338b491ed70929693093a2907eb774..c2ba25e5539f2af06362026bffa007a231395aaa 100644 (file)
--- a/deal.II/bundled/CMakeLists.txt
+++ b/deal.II/bundled/CMakeLists.txt
@@ -33,10 +33,7 @@ IF(FEATURE_BOOST_BUNDLED_CONFIGURED)
     )
 
   ADD_SUBDIRECTORY(${BOOST_FOLDER}/libs/serialization/src)
-
-  IF(DEAL_II_WITH_ZLIB AND DEAL_II_WITH_BZIP2)
-    ADD_SUBDIRECTORY(${BOOST_FOLDER}/libs/iostreams/src)
-  ENDIF()
+  ADD_SUBDIRECTORY(${BOOST_FOLDER}/libs/iostreams/src)
 
   IF(DEAL_II_WITH_THREADS AND NOT DEAL_II_WITH_CXX11)
     ADD_SUBDIRECTORY(${BOOST_FOLDER}/libs/thread/src)

diff --git a/deal.II/bundled/boost-1.49.0/libs/iostreams/src/CMakeLists.txt b/deal.II/bundled/boost-1.49.0/libs/iostreams/src/CMakeLists.txt
index 0f5549192e6b203c12bde8a3d45509309d3806f1..de3adb399c2193020c14690f356c59b9e8c292b2 100644 (file)
--- a/deal.II/bundled/boost-1.49.0/libs/iostreams/src/CMakeLists.txt
+++ b/deal.II/bundled/boost-1.49.0/libs/iostreams/src/CMakeLists.txt
@@ -15,12 +15,29 @@
 ## ---------------------------------------------------------------------
 
 SET(src_boost_iostreams
-    bzip2.cpp 
     file_descriptor.cpp
     gzip.cpp 
     mapped_file.cpp
-    zlib.cpp
   )
 
+IF(DEAL_II_WITH_ZLIB)
+  SET(src_boost_iostreams
+      ${src_boost_iostreams}
+      zlib.cpp
+  )
+ELSE()
+  MESSAGE(STATUS "BOOST::Iostreams will not support gzipped streams because libz could not be found")
+ENDIF()
+
+IF(DEALII_WITH_BZIP2)
+  SET(src_boost_iostreams
+      ${src_boost_iostreams}
+      bzip2.cpp 
+  )
+ELSE()
+  MESSAGE(STATUS "BOOST::Iostreams will not support bz2'ed streams because libz could not be found")
+ENDIF()
+
+
 DEAL_II_ADD_LIBRARY(obj_boost_iostreams OBJECT ${src_boost_iostreams})