cmake: Only require a C++ compiler
authorManuel Nickschas <sputnick@quassel-irc.org>
Wed, 25 Jul 2018 20:49:27 +0000 (22:49 +0200)
committerManuel Nickschas <sputnick@quassel-irc.org>
Sun, 18 Nov 2018 10:06:43 +0000 (11:06 +0100)
With miniz gone, the only reason to still specify both C and CXX
as project languages is the use of the check_include_file cmake
macro.

Turns out there's a C++ version of that one, too; so use it.

CMakeLists.txt

index 856e5fc..aa835a5 100644 (file)
@@ -42,7 +42,7 @@ if (USE_CCACHE)
 endif()
 
 # Set up project
 endif()
 
 # Set up project
-project(Quassel C CXX)
+project(Quassel CXX)
 
 # General conveniences
 set(CMAKE_AUTOMOC ON)
 
 # 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 various CMake modules
 include(CMakePushCheckState)
 include(CheckFunctionExists)
-include(CheckIncludeFile)
+include(CheckIncludeFileCXX)
 include(CheckCXXSourceCompiles)
 include(CMakeDependentOption)
 include(FeatureSummary)
 include(CheckCXXSourceCompiles)
 include(CMakeDependentOption)
 include(FeatureSummary)
@@ -490,7 +490,7 @@ add_feature_info("SSL support in Qt" HAVE_SSL "Use secure network connections")
 
 # Check for syslog support
 if (NOT WIN32)
 
 # 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()
 
     add_feature_info("syslog.h" HAVE_SYSLOG "Provide support for logging to the syslog")
 endif()