cmake: Only require a C++ compiler

[quassel.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2530ea2..aa835a5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@ if (USE_CCACHE)
 endif()
 
 # Set up project
-project(Quassel C CXX)
+project(Quassel CXX)
 
 # General conveniences
 set(CMAKE_AUTOMOC ON)
@@ -51,7 +51,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 # Include various CMake modules
 include(CMakePushCheckState)
 include(CheckFunctionExists)
-include(CheckIncludeFile)
+include(CheckIncludeFileCXX)
 include(CheckCXXSourceCompiles)
 include(CMakeDependentOption)
 include(FeatureSummary)
@@ -385,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)
@@ -485,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()
@@ -499,7 +490,7 @@ add_feature_info("SSL support in Qt" HAVE_SSL "Use secure network connections")
 
 # Check for syslog support
 if (NOT WIN32)
-    check_include_file(syslog.h HAVE_SYSLOG)
+    check_include_file_cxx(syslog.h HAVE_SYSLOG)
     add_feature_info("syslog.h" HAVE_SYSLOG "Provide support for logging to the syslog")
 endif()