From 566fb01e68c450a04fdaac99fc1b31d7621220dd Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 26 Nov 2021 13:21:47 +0300 Subject: [PATCH] Increment version: 9.8.0 --- CMakeLists.txt | 22 ++++++++++------------ bin/VERSION.in | 1 + 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 22a4974..f42f721 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,20 +17,14 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR) -PROJECT(SalomeHEXABLOCK C CXX) -# Versioning -# =========== -# Project name, upper case +# Project name +# ============ +# original +PROJECT(SalomeHEXABLOCK 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") @@ -41,6 +35,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}\"") + # Find KERNEL # =========== SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL") @@ -193,7 +192,6 @@ ENDIF(SALOME_BUILD_DOC) # Header configuration # ==================== -SALOME_XVERSION(${PROJECT_NAME}) SALOME_CONFIGURE_FILE(HEXABLOCK_version.h.in HEXABLOCK_version.h INSTALL ${SALOME_INSTALL_HEADERS}) # Configuration export diff --git a/bin/VERSION.in b/bin/VERSION.in index 1e5529b..3c2dd61 100644 --- a/bin/VERSION.in +++ b/bin/VERSION.in @@ -1,2 +1,3 @@ [SALOME HEXABLOCK] : @SALOMEHEXABLOCK_VERSION@ [DEVELOPMENT] : @SALOMEHEXABLOCK_VERSION_DEV@ +[SHA1] : @SALOMEHEXABLOCK_GIT_SHA1@ -- 2.39.2