From 4cd217e4b68ea838c07d72f2bb1036a87bfe4ae7 Mon Sep 17 00:00:00 2001 From: Pier Luigi Fiorini Date: Tue, 19 Aug 2014 17:59:18 +0200 Subject: [PATCH] Revert "Raise CMake requirement to 3.0+" This doesn't work when the partition manager is enabled because it uses ECM and ECMConfig.cmake fails with an error if the required CMake is not less than 2.8.13 Added a note here to remember about this. This reverts commit 2020eb0eb306f7319b2376b06acb8e242e7b7dc3. --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 77664523f..7556da11b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,10 @@ project( calamares ) -cmake_minimum_required( VERSION 3.0 ) + +# The partition manager uses ECM but ECMConfig.cmake +# will complain if we require CMake less than 2.8.13, +# so never change this. +cmake_minimum_required( VERSION 2.8.12 ) + set( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wl,--no-undefined" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wl,--fatal-warnings -Wnon-virtual-dtor -Woverloaded-virtual -Werror=return-type" )