From 0ef4d9612581990045ac766127700098e95b76a1 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 26 Nov 2021 13:21:46 +0300 Subject: [PATCH] Increment version: 9.8.0 --- CMakeLists.txt | 22 ++++++++++------------ VERSION.in | 1 + 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9fc267cc4..3fe938aea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,20 +19,14 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR) INCLUDE(CMakeDependentOption) -PROJECT(SalomeFIELDS C CXX) -# Versioning -# =========== -# Project name, upper case +# Project name +# ============ +# original +PROJECT(SalomeFIELDS C CXX) +# upper case STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) -SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9) -SET(${PROJECT_NAME_UC}_MINOR_VERSION 7) -SET(${PROJECT_NAME_UC}_PATCH_VERSION 0) -SET(${PROJECT_NAME_UC}_VERSION - ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION}) -SET(${PROJECT_NAME_UC}_VERSION_DEV 1) - # Common CMake macros # =================== SET(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake configuration files") @@ -43,6 +37,11 @@ ELSE() MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !") ENDIF() +# Versioning +# =========== +SALOME_SETUP_VERSION(9.8.0) +MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"") + # # Kernel detection comes before user options to be # able to take previous values of global options ... @@ -191,7 +190,6 @@ MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED SALOME_FIELD # Header configuration # ==================== -SALOME_XVERSION(${PROJECT_NAME}) SALOME_CONFIGURE_FILE(FIELDS_version.h.in FIELDS_version.h INSTALL ${SALOME_INSTALL_HEADERS}) SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS}) diff --git a/VERSION.in b/VERSION.in index 5a8446247..13bbaa18f 100644 --- a/VERSION.in +++ b/VERSION.in @@ -1,3 +1,4 @@ [SALOME FIELDS] : @SALOMEFIELDS_VERSION@ [DEVELOPMENT] : @SALOMEFIELDS_VERSION_DEV@ +[SHA1] : @SALOMEFIELDS_GIT_SHA1@ [DESCRIPTION] : SALOME FIELDS module -- 2.39.2