From da2f21e3af2bcb7522fa83393e065363b1f84984 Mon Sep 17 00:00:00 2001 From: bangerth Date: Mon, 23 Dec 2013 19:55:14 +0000 Subject: [PATCH] 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 --- deal.II/bundled/CMakeLists.txt | 5 +---- .../libs/iostreams/src/CMakeLists.txt | 21 +++++++++++++++++-- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/deal.II/bundled/CMakeLists.txt b/deal.II/bundled/CMakeLists.txt index 5330907750..c2ba25e553 100644 --- 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 0f5549192e..de3adb399c 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 @@ -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}) -- 2.39.5