From: Manuel Nickschas Date: Wed, 19 Mar 2014 20:08:08 +0000 (+0100) Subject: Don't actually build miniz if we have zlib X-Git-Tag: 0.11.0~101 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=93aa90cdc8ee608f4b65a32702eabb8a5590c273;hp=5b43f2776fa53bfe15a5b3b4398dfe3e931d5802 Don't actually build miniz if we have zlib We don't use miniz if we have zlib; but it was still being built, because we never actually set HAVE_ZLIB as a build system variable. Use ZLIB_FOUND instead. --- diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 46835e50..6a442184 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -50,9 +50,9 @@ if (HAVE_QCA2) set(SOURCES ${SOURCES} keyevent.cpp) endif(HAVE_QCA2) -if(NOT HAVE_ZLIB) +if (NOT ZLIB_FOUND) set(SOURCES ${SOURCES} ../../3rdparty/miniz/miniz.c) -endif(NOT HAVE_ZLIB) +endif() if(APPLE) set(SOURCES ${SOURCES} mac_utils.cpp)