Merge branch 'V9_8_BR'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1662a5e631c31574342f8cfa833100cfa535355..44508f373f10484eea9e1f5c678e50b2ed75b84f 100644 (file)
--- 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(SalomeSHAPERSTUDY C CXX)
 
-# Versioning
-# ===========
-# Project name, upper case
+# Project name
+# ============
+# original
+PROJECT(SalomeSHAPERSTUDY 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 DEVELOPMENT)
+MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"")
+
 # Platform setup (from CONFIGURATION)
 # ==============
 INCLUDE(SalomeSetupPlatform)

diff --git a/bin/VERSION.in b/bin/VERSION.in
index fa7593ad4b1b3db967b36b18f569c20974a33632..4a12b9f9797ef53d42c7447b888da2773b083c35 100644 (file)
--- a/bin/VERSION.in
+++ b/bin/VERSION.in
@@ -1,3 +1,4 @@
 [SALOME SHAPERSTUDY] : @SALOMESHAPERSTUDY_VERSION@
 [DEVELOPMENT]        : @SALOMESHAPERSTUDY_VERSION_DEV@
+[SHA1]               : @SALOMESHAPERSTUDY_GIT_SHA1@
 [DESCRIPTION]        : SHAPERSTUDY SALOME module