]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfix: Only compile bundled boost::iostreams if zlib is available
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 1 Jan 2014 12:17:20 +0000 (12:17 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 1 Jan 2014 12:17:20 +0000 (12:17 +0000)
git-svn-id: https://svn.dealii.org/trunk@32133 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/bundled/CMakeLists.txt
deal.II/bundled/boost-1.49.0/libs/iostreams/src/CMakeLists.txt

index c2ba25e5539f2af06362026bffa007a231395aaa..b4ff8c8bf6e05e0267b62f7fd68308de8b6b1b85 100644 (file)
@@ -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)
index 07e336c8cca8e0de559df0f404e2855896147125..ef8f84838ce349ad5cf61a70e00073d49fbe9514 100644 (file)
 
 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})
-

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.