From 383226930c8c66dfe2afee3af278573a01945f7f Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Wed, 25 Oct 2017 19:30:26 +0200 Subject: [PATCH] Remove BZIP2 dependency --- .../libs/iostreams/src/CMakeLists.txt | 6 --- cmake/configure/configure_1_bzip2.cmake | 20 -------- cmake/modules/FindBZIP2.cmake | 50 ------------------- .../incompatibilities/20171025DanielArndt | 4 ++ include/deal.II/base/config.h.in | 1 - 5 files changed, 4 insertions(+), 77 deletions(-) delete mode 100644 cmake/configure/configure_1_bzip2.cmake delete mode 100644 cmake/modules/FindBZIP2.cmake create mode 100644 doc/news/changes/incompatibilities/20171025DanielArndt diff --git a/bundled/boost-1.62.0/libs/iostreams/src/CMakeLists.txt b/bundled/boost-1.62.0/libs/iostreams/src/CMakeLists.txt index 1068dc0abb..cb159d707e 100644 --- a/bundled/boost-1.62.0/libs/iostreams/src/CMakeLists.txt +++ b/bundled/boost-1.62.0/libs/iostreams/src/CMakeLists.txt @@ -26,10 +26,4 @@ SET(src_boost_iostreams zlib.cpp ) -IF(DEAL_II_WITH_BZIP2) - 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}) diff --git a/cmake/configure/configure_1_bzip2.cmake b/cmake/configure/configure_1_bzip2.cmake deleted file mode 100644 index ae86e4496b..0000000000 --- a/cmake/configure/configure_1_bzip2.cmake +++ /dev/null @@ -1,20 +0,0 @@ -## --------------------------------------------------------------------- -## -## Copyright (C) 2012 - 2014 by the deal.II authors -## -## This file is part of the deal.II library. -## -## The deal.II library is free software; you can use it, redistribute -## it, and/or modify it under the terms of the GNU Lesser General -## Public License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## The full text of the license can be found in the file LICENSE at -## the top level of the deal.II distribution. -## -## --------------------------------------------------------------------- - -# -# Configuration for the bzip2 library: -# - -CONFIGURE_FEATURE(BZIP2) diff --git a/cmake/modules/FindBZIP2.cmake b/cmake/modules/FindBZIP2.cmake deleted file mode 100644 index 973ccbc74b..0000000000 --- a/cmake/modules/FindBZIP2.cmake +++ /dev/null @@ -1,50 +0,0 @@ -## --------------------------------------------------------------------- -## -## Copyright (C) 2014 - 2015 by the deal.II authors -## -## This file is part of the deal.II library. -## -## The deal.II library is free software; you can use it, redistribute -## it, and/or modify it under the terms of the GNU Lesser General -## Public License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## The full text of the license can be found in the file LICENSE at -## the top level of the deal.II distribution. -## -## --------------------------------------------------------------------- - -# -# Try to find the BZIP2 library -# -# This module exports -# -# BZIP2_LIBRARIES -# BZIP2_INCLUDE_DIRS -# BZIP2_VERSION -# - -SET(BZIP2_DIR "" CACHE PATH "An optional hint to a BZIP2 installation") -SET_IF_EMPTY(BZIP2_DIR "$ENV{BZIP2_DIR}") - -SET(_cmake_prefix_path_backup "${CMAKE_PREFIX_PATH}") - -# temporarily disable ${CMAKE_SOURCE_DIR}/cmake/modules for module lookup -LIST(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/) - -SET(CMAKE_PREFIX_PATH ${BZIP2_DIR} ${_cmake_prefix_path_backup}) - -FIND_PACKAGE(BZip2) - -SET(CMAKE_PREFIX_PATH ${_cmake_prefix_path_backup}) -LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/) - -SET(BZIP2_VERSION ${BZIP2_VERSION_STRING}) -SET(_bzip2_libraries ${BZIP2_LIBRARIES}) - -DEAL_II_PACKAGE_HANDLE(BZIP2 - LIBRARIES REQUIRED _bzip2_libraries - INCLUDE_DIRS REQUIRED BZIP2_INCLUDE_DIR - CLEAR - BZIP2_INCLUDE_DIR BZIP2_LIBRARY_DEBUG BZIP2_LIBRARY_RELEASE - BZIP2_NEED_PREFIX - ) diff --git a/doc/news/changes/incompatibilities/20171025DanielArndt b/doc/news/changes/incompatibilities/20171025DanielArndt new file mode 100644 index 0000000000..e20c239faf --- /dev/null +++ b/doc/news/changes/incompatibilities/20171025DanielArndt @@ -0,0 +1,4 @@ +Removed: The BZIP2 dependency has been removed as it was not used +in the library anymore. +
+(Daniel Arndt, 2017/10/25) diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in index 8a9ecc3e8e..fc0b5c7184 100644 --- a/include/deal.II/base/config.h.in +++ b/include/deal.II/base/config.h.in @@ -38,7 +38,6 @@ #cmakedefine DEAL_II_WITH_ADOLC #cmakedefine DEAL_II_WITH_ARPACK #cmakedefine DEAL_II_WITH_ASSIMP -#cmakedefine DEAL_II_WITH_BZIP2 #cmakedefine DEAL_II_WITH_CUDA #cmakedefine DEAL_II_WITH_CXX14 #cmakedefine DEAL_II_WITH_GSL -- 2.39.5