From 10381b10f899f644a30826f535dabc9e037463e6 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Tue, 12 Sep 2017 18:14:03 +0200 Subject: [PATCH] CMake 3.1 is the actually required version Summary: CXX_STANDARD is only available since 3.1. $ git show 913394af2: cmTarget: Add CXX_STANDARD and CXX_EXTENSION... $ git tag --contains 913394af2 | head -n: v3.1.0 3.1 also has CMakePackageConfigHelpers (available since 3.0), allowing to drop ECMPackageConfigHelpers (it actually fixes a CMake warning when requiring >=3.0). Furthermore move cmake_minimum_required(VERSION 3.1 FATAL_ERROR) to the top of CMakeLists.txt like suggested by CMake's documentation. Test Plan: cmake .. & ninja Reviewers: #kwin, #plasma Subscribers: plasma-devel, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D7784 --- CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 055a87a07c..b8b72b71cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,9 @@ +cmake_minimum_required(VERSION 3.1 FATAL_ERROR) + project(KWIN) set(PROJECT_VERSION "5.10.90") set(PROJECT_VERSION_MAJOR 5) -cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) set(QT_MIN_VERSION "5.7.0") set(KF5_MIN_VERSION "5.34.0") @@ -668,9 +669,9 @@ endif() feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) -include(ECMPackageConfigHelpers) +include(CMakePackageConfigHelpers) set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KWinDBusInterface") -ecm_configure_package_config_file(KWinDBusInterfaceConfig.cmake.in +configure_package_config_file(KWinDBusInterfaceConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/KWinDBusInterfaceConfig.cmake" PATH_VARS KDE_INSTALL_DBUSINTERFACEDIR INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR})