From: Matthias Maier <tamiko@kyomu.43-1.org>
Date: Wed, 1 Jan 2014 12:17:20 +0000 (+0000)
Subject: Bugfix: Only compile bundled boost::iostreams if zlib is available
X-Git-Tag: v8.2.0-rc1~1098
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1837a26f5e2d17262d2469a2138c82cf141904e4;p=dealii.git

Bugfix: Only compile bundled boost::iostreams if zlib is available

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

diff --git a/deal.II/bundled/CMakeLists.txt b/deal.II/bundled/CMakeLists.txt
index c2ba25e553..b4ff8c8bf6 100644
--- a/deal.II/bundled/CMakeLists.txt
+++ b/deal.II/bundled/CMakeLists.txt
@@ -33,7 +33,12 @@ IF(FEATURE_BOOST_BUNDLED_CONFIGURED)
     )
 
   ADD_SUBDIRECTORY(${BOOST_FOLDER}/libs/serialization/src)
-  ADD_SUBDIRECTORY(${BOOST_FOLDER}/libs/iostreams/src)
+
+  IF(DEAL_II_WITH_ZLIB)
+    ADD_SUBDIRECTORY(${BOOST_FOLDER}/libs/iostreams/src)
+  ELSE()
+    MESSAGE(STATUS "BOOST::Iostreams will not be available because zlib or its header files could not be found")
+  ENDIF()
 
   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 07e336c8cc..ef8f84838c 100644
--- 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
@@ -16,28 +16,15 @@
 
 SET(src_boost_iostreams
     file_descriptor.cpp
-    gzip.cpp 
+    gzip.cpp
     mapped_file.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 or its header files could not be found")
-ENDIF()
+    zlib.cpp
+    )
 
 IF(DEALII_WITH_BZIP2)
-  SET(src_boost_iostreams
-      ${src_boost_iostreams}
-      bzip2.cpp 
-  )
+  LIST(APPEND src_boost_iostreams bzip2.cpp)
 ELSE()
   MESSAGE(STATUS "BOOST::Iostreams will not support bz2'ed streams because libbz2 or its header files could not be found")
 ENDIF()
 
-
 DEAL_II_ADD_LIBRARY(obj_boost_iostreams OBJECT ${src_boost_iostreams})
-