projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmake: Make zlib a required dependency, remove bundled miniz
[quassel.git]
/
src
/
common
/
CMakeLists.txt
diff --git
a/src/common/CMakeLists.txt
b/src/common/CMakeLists.txt
index
1c0fd26
..
737a42c
100644
(file)
--- a/
src/common/CMakeLists.txt
+++ b/
src/common/CMakeLists.txt
@@
-62,13
+62,6
@@
if (QCA2-QT5_FOUND)
set(SOURCES ${SOURCES} keyevent.cpp)
endif()
set(SOURCES ${SOURCES} keyevent.cpp)
endif()
-if (ZLIB_FOUND)
- add_definitions(-DHAVE_ZLIB)
- include_directories(${ZLIB_INCLUDE_DIRS})
-else()
- set(SOURCES ${SOURCES} ../../3rdparty/miniz/miniz.c)
-endif()
-
if (HAVE_SYSLOG)
add_definitions(-DHAVE_SYSLOG)
endif()
if (HAVE_SYSLOG)
add_definitions(-DHAVE_SYSLOG)
endif()
@@
-96,11
+89,7
@@
if (APPLE)
target_link_libraries(mod_common "-framework CoreServices" "-framework CoreFoundation")
endif()
target_link_libraries(mod_common "-framework CoreServices" "-framework CoreFoundation")
endif()
-target_link_libraries(mod_common ${CMAKE_DL_LIBS} ${EXECINFO_LIBRARIES})
-
-if(ZLIB_FOUND)
- target_link_libraries(mod_common ${ZLIB_LIBRARIES})
-endif()
+target_link_libraries(mod_common ${CMAKE_DL_LIBS} ${EXECINFO_LIBRARIES} ZLIB::ZLIB)
# This is needed so translations are generated before trying to build the qrc.
# Should probably find a nicer solution with proper dependencies between the involved files, though...
# This is needed so translations are generated before trying to build the qrc.
# Should probably find a nicer solution with proper dependencies between the involved files, though...