From 19b65a2d6d9462ac70f2df29ee27cf0e22eda8f6 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 26 Nov 2021 13:21:48 +0300 Subject: [PATCH] Increment version: 9.8.0 --- CMakeLists.txt | 22 ++++++++++------------ bin/VERSION.in | 5 +++-- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d042c2..626a9b7 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(SalomeHYBRIDPLUGIN C CXX) -# Versioning -# =========== -# Project name, upper case +# Project name +# ============ +# original +PROJECT(SalomeHYBRIDPLUGIN 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") @@ -229,7 +228,6 @@ ENDIF(SALOME_BUILD_TESTS) # Header configuration # ==================== -SALOME_XVERSION(${PROJECT_NAME}) SALOME_CONFIGURE_FILE(HYBRIDPLUGIN_version.h.in HYBRIDPLUGIN_version.h INSTALL ${SALOME_INSTALL_HEADERS}) # Configuration export diff --git a/bin/VERSION.in b/bin/VERSION.in index 4b2c65c..5536b72 100644 --- a/bin/VERSION.in +++ b/bin/VERSION.in @@ -1,3 +1,4 @@ [SALOME HYBRIDPLUGIN] : @SALOMEHYBRIDPLUGIN_VERSION@ -[DEVELOPMENT] : @SALOMEHYBRIDPLUGIN_VERSION_DEV@ -[DESCRIPTION] : DISTENE MG-HYBRID meshing plug-in for SALOME Mesh module +[DEVELOPMENT] : @SALOMEHYBRIDPLUGIN_VERSION_DEV@ +[SHA1] : @SALOMEHYBRIDPLUGIN_GIT_SHA1@ +[DESCRIPTION] : DISTENE MG-HYBRID meshing plug-in for SALOME Mesh module -- 2.39.2