X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=a220522805838739749a7f45ddd58c19ac683525;hp=b5586de19014da843e604ca7746c1812f824cdd0;hb=b0021c10835573ee881e067e9550a1625834177d;hpb=52707acc6e5dbc386084083cd7d7a144ae151a4a

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5586de1..a2205228 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,19 +25,13 @@
 # NOTE: You should remove CMakeCache.txt if you plan to change any of these values!
 
 
+cmake_minimum_required(VERSION 2.8.9)
 project(QuasselIRC)
 
 include(CheckFunctionExists)
 include(CheckIncludeFile)
 include(CheckCXXCompilerFlag)
 
-# For building against Qt5, we check for an even newer cmake version below!
-cmake_minimum_required(VERSION 2.8.1 FATAL_ERROR)
-
-if(COMMAND cmake_policy)
-   cmake_policy(SET CMP0003 NEW)
-endif(COMMAND cmake_policy)
-
 # Use our own (well, and KDE's) version of some modules
 # In particular cmake's own FindQt4 and FindOpenSSL are quite buggy
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
@@ -242,6 +236,21 @@ if(QT_LRELEASE_EXECUTABLE)
 endif(QT_LRELEASE_EXECUTABLE)
 
 
+# zlib for compression, however we can always fall back to miniz
+find_package(ZLIB)
+if(ZLIB_FOUND)
+  message(STATUS "Using system zlib for compression")
+  add_definitions(-DHAVE_ZLIB)
+  include_directories(${ZLIB_INCLUDE_DIRS})
+  set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${ZLIB_LIBRARIES})
+else()
+  message(STATUS "zlib NOT found, using bundled miniz for compression")
+  if(${CMAKE_SIZEOF_VOID_P} EQUAL 4)
+    message(STATUS "WARNING: This may be slow on 32 bit systems!")
+  endif()
+endif()
+
+
 # Execinfo is needed for generating backtraces
 find_package(ExecInfo)
 if(EXECINFO_FOUND)
@@ -382,6 +391,13 @@ if(BUILD_GUI)
     else(WITH_PHONON)
       message(STATUS "Not enabling Phonon support")
     endif(WITH_PHONON)
+
+    find_package(Libsnore)
+    if(LIBSNORE_FOUND)
+        add_definitions(-DHAVE_LIBSNORE)
+        set(CLIENT_LIBRARIES ${CLIENT_LIBRARIES} ${LIBSNORE_LIBRARIES})
+        set(HAVE_SNORENOTIFY true)
+    endif(LIBSNORE_FOUND)
   endif(NOT HAVE_KDE)
 
   # Setup libindicate-qt support
@@ -410,13 +426,6 @@ if(BUILD_GUI)
       /System/Library/Frameworks/Foundation.framework
     )
   endif()
-
-find_package(Libsnore)
-if(LIBSNORE_FOUND)
-    add_definitions(-DHAVE_LIBSNORE -DLIBSNORE_PLUGIN_PATH="${LIBSNORE_PLUGIN_PATH}")
-    set(CLIENT_LIBRARIES ${CLIENT_LIBRARIES} ${LIBSNORE_LIBRARIES})
-    set(HAVE_SNORENOTIFY true)
-endif(LIBSNORE_FOUND)
 endif(BUILD_GUI)
 
 # Core-only deps