Don't actually build miniz if we have zlib

[quassel.git] / src / common / CMakeLists.txt

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 8690625..6a44218 100644 (file)
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -1,7 +1,5 @@
 # Builds the common module
 
-setup_qt_variables(Core Network)
-
 set(SOURCES
     aliasmanager.cpp
     authhandler.cpp
@@ -52,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)
@@ -67,10 +65,8 @@ if(CMAKE_HOST_UNIX)
     set(SOURCES ${SOURCES} logbacktrace_unix.cpp)
 endif(CMAKE_HOST_UNIX)
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QUASSEL_QT_INCLUDES})  # for version.inc and version.gen
-
 add_library(mod_common STATIC ${SOURCES})
-set_target_properties(mod_common PROPERTIES COMPILE_FLAGS "${QUASSEL_QT_COMPILEFLAGS}")
+qt_use_modules(mod_common Core Network)
 
 if(APPLE)
   target_link_libraries(mod_common "-framework CoreServices" "-framework CoreFoundation")