]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Remove BZIP2 dependency
authorDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Wed, 25 Oct 2017 17:30:26 +0000 (19:30 +0200)
committerDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Wed, 25 Oct 2017 17:48:50 +0000 (19:48 +0200)
bundled/boost-1.62.0/libs/iostreams/src/CMakeLists.txt
cmake/configure/configure_1_bzip2.cmake [deleted file]
cmake/modules/FindBZIP2.cmake [deleted file]
doc/news/changes/incompatibilities/20171025DanielArndt [new file with mode: 0644]
include/deal.II/base/config.h.in

index 1068dc0abba630d8f70e2e43f49ef3ac9dc642ec..cb159d707e6a1efffecd8839dddae5ac934a7041 100644 (file)
@@ -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 (file)
index ae86e44..0000000
+++ /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 (file)
index 973ccbc..0000000
+++ /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 (file)
index 0000000..e20c239
--- /dev/null
@@ -0,0 +1,4 @@
+Removed: The BZIP2 dependency has been removed as it was not used
+in the library anymore.
+<br>
+(Daniel Arndt, 2017/10/25)
index 8a9ecc3e8e8358914378a3df19920bde210f7c0d..fc0b5c7184b5fb2b5df8788d43887164bae3f1f5 100644 (file)
@@ -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

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.