X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2FCMakeLists.txt;h=737a42c8382a5d8d7b424b311845dc1c3921f7eb;hp=1c0fd26fbf3b73d652226439ca4b741fdfd67dac;hb=6718d7a1ccd42d7aae75e57d6974e0b1e0384044;hpb=cc9f5099567634673f181aa49ae0b5d19bf93f7c diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 1c0fd26f..737a42c8 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -62,13 +62,6 @@ if (QCA2-QT5_FOUND) 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() @@ -96,11 +89,7 @@ if (APPLE) 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...