From: vsr Date: Fri, 26 Nov 2021 10:21:48 +0000 (+0300) Subject: Increment version: 9.8.0 X-Git-Tag: V9_8_0rc1^0 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=43f3531056d78f78c8d337173f1b68a4a6dc67c8;p=plugins%2Fgmshplugin.git Increment version: 9.8.0 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index ec21cfc..3e9514f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,20 +19,14 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR) -PROJECT(SalomeGMSHPLUGIN C CXX) -# Versioning -# =========== -# Project name, upper case +# Project name +# ============ +# original +PROJECT(SalomeGMSHPLUGIN 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}\"") + # Find KERNEL # =========== SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL") @@ -219,7 +218,6 @@ ENDIF(SALOME_BUILD_DOC) # Header configuration # ==================== -SALOME_XVERSION(${PROJECT_NAME}) SALOME_CONFIGURE_FILE(GMSHPLUGIN_version.h.in GMSHPLUGIN_version.h INSTALL ${SALOME_INSTALL_HEADERS}) # Configuration export diff --git a/bin/VERSION.in b/bin/VERSION.in index 645747e..19fb1b1 100644 --- a/bin/VERSION.in +++ b/bin/VERSION.in @@ -1,3 +1,4 @@ [SALOME GMSHPLUGIN] : @SALOMEGMSHPLUGIN_VERSION@ [DEVELOPMENT] : @SALOMEGMSHPLUGIN_VERSION_DEV@ +[SHA1] : @SALOMEGMSHPLUGIN_GIT_SHA1@ [DESCRIPTION] : Gmsh meshing plug-in for SALOME Mesh module