From 14bedef411856c5c51f2b970863a14217e94409c Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 4 Apr 2019 16:43:04 +0200 Subject: [PATCH] CMake: change project identifier to simplify code - Using CALAMARES means that the automatic versioning variables are set using that name (instead of lower-case). --- CMakeLists.txt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8477e33f7..504f30c6b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,10 +36,12 @@ # to obtain the version number from here. cmake_minimum_required( VERSION 3.2 FATAL_ERROR ) -project( calamares +project( CALAMARES VERSION 3.2.5 LANGUAGES C CXX ) +set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development + ### OPTIONS # option( INSTALL_CONFIG "Install configuration files" OFF ) @@ -77,12 +79,6 @@ set( CALAMARES_APPLICATION_NAME "Calamares" ) set( CALAMARES_DESCRIPTION_SUMMARY "The distribution-independent installer framework" ) -# Take settings from the project() command -set( CALAMARES_VERSION_MAJOR ${calamares_VERSION_MAJOR} ) -set( CALAMARES_VERSION_MINOR ${calamares_VERSION_MINOR} ) -set( CALAMARES_VERSION_PATCH ${calamares_VERSION_PATCH} ) -set( CALAMARES_VERSION_RC 0 ) - ### Transifex (languages) info # # complete = 100% translated,