projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5b43f27
)
Don't actually build miniz if we have zlib
author
Manuel Nickschas
<sputnick@quassel-irc.org>
Wed, 19 Mar 2014 20:08:08 +0000
(21:08 +0100)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Wed, 19 Mar 2014 20:08:08 +0000
(21:08 +0100)
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.
src/common/CMakeLists.txt
patch
|
blob
|
history
diff --git
a/src/common/CMakeLists.txt
b/src/common/CMakeLists.txt
index
46835e5
..
6a44218
100644
(file)
--- 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)