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."
"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
INCLUDE(configure_umfpack)
ENDIF()
+IF(DEAL_II_WITH_ZLIB)
+ INCLUDE(configure_zlib)
+ENDIF()
+
])
-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 <zlib.h>
- AC_CHECK_HEADER(zlib.h,
- [
- DEAL_II_ADD_EXTERNAL_LIBS_AT_FRONT(-l$zlib)
- AC_DEFINE(HAVE_LIBZ,[],"")
- ])
- ])
-])
-
-
dnl ------------------------------------------------------------
--- /dev/null
+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)
+/*
+ * Configured in configure_umfpack.cmake:
+ */
+
+
+/* Defined if deal.II was configure with zlib support */
+#cmakedefine HAVE_LIBZ 1
+
+
+
+
/*
* Configured in check_for_cxx_features:
*/
libstdc++ interface. */
#cmakedefine HAVE_LIBSTDCXX_DEMANGLER
-/* "" */
-#cmakedefine HAVE_LIBZ
/* Define to 1 if you have the <memory.h> header file. */
#cmakedefine HAVE_MEMORY_H