X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=542d362b912930c77abf40681f6b5056a4ba8c37;hp=856e5fca9716302c42fc5d40c1fd5e02a448f296;hb=9b689f0e308cc0007f63086c3dc45db219d5b7db;hpb=6718d7a1ccd42d7aae75e57d6974e0b1e0384044 diff --git a/CMakeLists.txt b/CMakeLists.txt index 856e5fca..542d362b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,8 @@ # General setup ##################################################################### +cmake_minimum_required(VERSION 3.5) + # Versions set(QUASSEL_MAJOR 0) set(QUASSEL_MINOR 13) @@ -42,7 +44,7 @@ if (USE_CCACHE) endif() # Set up project -project(Quassel C CXX) +project(Quassel CXX) # General conveniences set(CMAKE_AUTOMOC ON) @@ -51,7 +53,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) @@ -144,12 +146,6 @@ option(WITH_LDAP "Enable LDAP authentication support if present on system" ON) # Setup CMake ##################################################################### -if (WITH_KDE) - cmake_minimum_required(VERSION 2.8.12) -else() - cmake_minimum_required(VERSION 2.8.9) -endif() - # Setting COMPILE_DEFINITIONS_ is deprecated since CMake 3.0 in favor of generator expressions. # These have existed since CMake 2.8.10; until we depend on that, we have to explicitly enable the old policy. if (POLICY CMP0043) @@ -490,7 +486,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()