Commit 336a62c7 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

changed HAVE_ZLIB to HAVE_VTK_ZLIB due to double definition in alugrid

parent 1114f5a4
find_package(ZLIB)
set(HAVE_ZLIB ${ZLIB_FOUND})
if (${HAVE_ZLIB})
dune_register_package_flags(COMPILE_DEFINITIONS "ENABLE_ZLIB=1"
set(HAVE_VTK_ZLIB ${ZLIB_FOUND})
if (${HAVE_VTK_ZLIB})
dune_register_package_flags(COMPILE_DEFINITIONS "ENABLE_VTK_ZLIB=1"
LIBRARIES "${ZLIB_LIBRARIES}"
INCLUDE_DIRS "${ZLIB_INCLUDE_DIRS}")
endif (${HAVE_ZLIB})
endif (${HAVE_VTK_ZLIB})
......@@ -41,7 +41,7 @@
#define DUNE_VTK_VERSION_REVISION @DUNE_VTK_VERSION_REVISION@
/* Define if you have the ZLIB library. */
#cmakedefine HAVE_ZLIB ENABLE_ZLIB
#cmakedefine HAVE_VTK_ZLIB ENABLE_VTK_ZLIB
/* end dune-vtk
Everything below here will be overwritten
......
......@@ -8,4 +8,4 @@ Version: 0.1
Maintainer: simon.praetorius@tu-dresden.de
#depending on
Depends: dune-common (>= 2.6) dune-geometry (>= 2.6) dune-grid
Suggests: dune-functions dune-spgrid dune-polygongrid
Suggests: dune-functions dune-spgrid dune-polygongrid dune-uggrid dune-alugrid
......@@ -3,7 +3,7 @@
#include <iterator>
#include <string>
#ifdef HAVE_ZLIB
#ifdef HAVE_VTK_ZLIB
#include <zlib.h>
#endif
......@@ -361,7 +361,7 @@ template <class T, class IStream>
void read_compressed (T* buffer, unsigned char* buffer_in,
std::uint64_t bs, std::uint64_t cbs, IStream& input)
{
#ifdef HAVE_ZLIB
#ifdef HAVE_VTK_ZLIB
uLongf uncompressed_space = uLongf(bs);
uLongf compressed_space = uLongf(cbs);
......
......@@ -9,7 +9,7 @@
#include <sstream>
#include <string>
#if HAVE_ZLIB
#if HAVE_VTK_ZLIB
#include <zlib.h>
#endif
......
......@@ -49,7 +49,7 @@ namespace Dune
, format_(format)
, datatype_(datatype)
{
#if !HAVE_ZLIB
#if !HAVE_VTK_ZLIB
if (format_ == Vtk::COMPRESSED) {
std::cout << "Dune is compiled without compression. Falling back to BINARY VTK output!\n";
format_ = Vtk::BINARY;
......
......@@ -8,7 +8,7 @@
#include <sstream>
#include <string>
#if HAVE_ZLIB
#if HAVE_VTK_ZLIB
#include <zlib.h>
#endif
......@@ -216,7 +216,7 @@ template <class OStream>
std::uint64_t writeCompressed (unsigned char const* buffer, unsigned char* buffer_out,
std::uint64_t bs, std::uint64_t cbs, int level, OStream& outb)
{
#if HAVE_ZLIB
#if HAVE_VTK_ZLIB
uLongf uncompressed_space = uLongf(bs);
uLongf compressed_space = uLongf(cbs);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment