From: maier Date: Tue, 11 Sep 2012 14:44:59 +0000 (+0000) Subject: Add support for zlib X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4415124627ba3cdb0ef300e6bd97556895d0e90c;p=dealii-svn.git Add support for zlib git-svn-id: https://svn.dealii.org/branches/branch_cmake@26285 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index 899fa2ebef..0f860033b0 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -57,7 +57,7 @@ OPTION(DEAL_II_WITH_FUNCTIONPARSER OPTION(DEAL_II_WITH_METIS "Build deal.II with support for Metis." - OFF) + ON) OPTION(DEAL_II_WITH_MPI "Build deal.II with support for mpi." @@ -75,6 +75,10 @@ OPTION(DEAL_II_WITH_UMFPACK "Build deal.II with support for UMFPACK, BLAS and LAPACK." ON) +OPTION(DEAL_II_WITH_ZLIB + "Build deal.II with support for zlib." + ON) + OPTION(DEAL_II_ALLOW_CONTRIB @@ -146,6 +150,10 @@ IF(DEAL_II_WITH_UMFPACK) INCLUDE(configure_umfpack) ENDIF() +IF(DEAL_II_WITH_ZLIB) + INCLUDE(configure_zlib) +ENDIF() + diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index a1ba357478..ccbdaec7bd 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -6877,31 +6877,6 @@ AC_DEFUN(DEAL_II_CHECK_BLAS_FRAMEWORK, dnl ]) -dnl -------------------------------------------------- -dnl Include the GSL library -dnl -------------------------------------------------- -AC_DEFUN(DEAL_II_WITH_ZLIB, dnl -[ - if test "x$1" != "xyes" ; then - zlib=$1 - else - zlib=z - fi - - dnl See if we can find the function crc32 in libz.so - AC_CHECK_LIB($zlib, crc32, - [ - dnl Yes, we can. Now also check whether we can do - dnl #include - AC_CHECK_HEADER(zlib.h, - [ - DEAL_II_ADD_EXTERNAL_LIBS_AT_FRONT(-l$zlib) - AC_DEFINE(HAVE_LIBZ,[],"") - ]) - ]) -]) - - dnl ------------------------------------------------------------ diff --git a/deal.II/contrib/cmake/configure/configure_zlib.cmake b/deal.II/contrib/cmake/configure/configure_zlib.cmake new file mode 100644 index 0000000000..2bb0cd4ac8 --- /dev/null +++ b/deal.II/contrib/cmake/configure/configure_zlib.cmake @@ -0,0 +1,10 @@ +FIND_PACKAGE(Netcdf REQUIRED) + +FIND_PACKAGE(ZLIB REQUIRED) + +INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS}) + +LIST(APPEND deal_ii_external_libraries ${ZLIB_LIBRARIES}) +LIST(APPEND deal_ii_external_debug_libraries ${ZLIB_LIBRARIES}) + +SET(HAVE_LIBZ TRUE) diff --git a/deal.II/include/deal.II/base/config.h.in b/deal.II/include/deal.II/base/config.h.in index 7ad180e13c..3780aa197f 100644 --- a/deal.II/include/deal.II/base/config.h.in +++ b/deal.II/include/deal.II/base/config.h.in @@ -146,6 +146,17 @@ +/* + * Configured in configure_umfpack.cmake: + */ + + +/* Defined if deal.II was configure with zlib support */ +#cmakedefine HAVE_LIBZ 1 + + + + /* * Configured in check_for_cxx_features: */ diff --git a/deal.II/include/deal.II/base/config.h.in.old b/deal.II/include/deal.II/base/config.h.in.old index 8abe716edf..f4c943252b 100644 --- a/deal.II/include/deal.II/base/config.h.in.old +++ b/deal.II/include/deal.II/base/config.h.in.old @@ -343,8 +343,6 @@ libstdc++ interface. */ #cmakedefine HAVE_LIBSTDCXX_DEMANGLER -/* "" */ -#cmakedefine HAVE_LIBZ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_MEMORY_H