cmake: Make zlib a required dependency, remove bundled miniz

[quassel.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 71fa429..856e5fc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -241,15 +241,6 @@ if (BUILD_GUI)
         PURPOSE     "Required for audio notifications"
     )
 
-    if (NOT Qt5Multimedia_FOUND)
-        find_package(Phonon4Qt5 QUIET)
-        set_package_properties(Phonon4Qt5 PROPERTIES TYPE RECOMMENDED
-            URL "https://projects.kde.org/projects/kdesupport/phonon"
-            DESCRIPTION "a multimedia abstraction library"
-            PURPOSE     "Required for audio notifications"
-        )
-    endif()
-
     find_package(LibsnoreQt5 0.7.0 QUIET)
     set_package_properties(LibsnoreQt5 PROPERTIES TYPE OPTIONAL
         URL "https://projects.kde.org/projects/playground/libs/snorenotify"
@@ -265,7 +256,6 @@ if (BUILD_GUI)
         )
     endif()
 
-
     if (WITH_WEBKIT)
         find_package(Qt5WebKit QUIET)
         set_package_properties(Qt5WebKit PROPERTIES TYPE RECOMMENDED
@@ -395,15 +385,13 @@ endif()
 
 # Non-Qt-based packages
 
-# zlib for compression, however we can always fall back to miniz
-find_package(ZLIB QUIET)
-set_package_properties(ZLIB PROPERTIES TYPE RECOMMENDED
+find_package(ZLIB REQUIRED)
+set_package_properties(ZLIB PROPERTIES TYPE REQUIRED
     URL "http://www.zlib.net"
     DESCRIPTION "a popular compression library"
-    PURPOSE     "Use the most common library for protocol compression, instead of the bundled miniz implementation"
+    PURPOSE     "Used for protocol compression"
 )
 
-
 if (NOT WIN32)
     # Execinfo is needed for generating backtraces
     find_package(ExecInfo QUIET)
@@ -495,13 +483,6 @@ include(QuasselInstallDirs)
 # Various config-dependent checks and settings
 #####################################################################
 
-if (NOT ZLIB_FOUND)
-    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()
-
 if (HAVE_SSL)
     add_definitions(-DHAVE_SSL)
 endif()