From 8ab1a4fb30bea32b73d7de9e451427109b0950b9 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 28 Mar 2021 18:51:44 +0200 Subject: [PATCH] CMake: require 3.16 This is just prep-work: from here, we can re-work FindBoost usage and the FindPython things as well. --- CMakeLists.txt | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b17e99ac3..18eeae5cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,15 +38,24 @@ # One special target is "show-version", which can be built # to obtain the version number from here. -# TODO:3.3: Require CMake 3.12 -cmake_minimum_required( VERSION 3.3 FATAL_ERROR ) +cmake_minimum_required( VERSION 3.16 FATAL_ERROR ) + +set( CALAMARES_VERSION 3.3.0 ) +set( CALAMARES_RELEASE_MODE OFF ) # Set to ON during a release + +if ( CMAKE_SCRIPT_MODE_FILE ) + include( ${CMAKE_CURRENT_LIST_DIR}/CMakeModules/ExtendedVersion.cmake ) + set( CMAKE_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR} ) + extend_version( ${CALAMARES_VERSION} OFF _vshort _vlong ) + message( "${_vlong}" ) + return() +endif() + project( CALAMARES - VERSION 3.2.43 + VERSION ${CALAMARES_VERSION} LANGUAGES C CXX ) -set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development - ### OPTIONS # option( INSTALL_CONFIG "Install configuration files" OFF )