From: Manuel Nickschas Date: Wed, 25 Jul 2018 20:49:27 +0000 (+0200) Subject: cmake: Only require a C++ compiler X-Git-Tag: test-travis-01~179 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=e900ab99c3ab96fa8aed781785fe94b21c8c7890 cmake: Only require a C++ compiler 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. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 856e5fca..aa835a5e 100644 --- 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) @@ -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_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()