From: vsr Date: Fri, 26 Nov 2021 10:21:46 +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=4e7cb20a3d531d7e145c814a1de5a1c52bf00415;p=modules%2Fhomard.git Increment version: 9.8.0 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d844501..7fd2f8c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,20 +18,13 @@ # CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR) +# Project name +# ============ +# original PROJECT(SalomeHOMARD C CXX) - -# Versioning -# =========== -# Project name, upper case +# 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") @@ -42,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") @@ -253,7 +251,6 @@ ADD_SUBDIRECTORY(bin) # Header configuration # ==================== -SALOME_XVERSION(${PROJECT_NAME}) SALOME_CONFIGURE_FILE(HOMARD_version.h.in HOMARD_version.h INSTALL ${SALOME_INSTALL_HEADERS}) # Configuration export diff --git a/bin/VERSION.in b/bin/VERSION.in index f2923eaa..9743a0f3 100644 --- a/bin/VERSION.in +++ b/bin/VERSION.in @@ -1,3 +1,3 @@ [SALOME HOMARD] : @SALOMEHOMARD_VERSION@ [DEVELOPMENT] : @SALOMEHOMARD_VERSION_DEV@ - +[SHA1] : @SALOMEHOMARD_GIT_SHA1@