Merge branch 'V9_8_BR'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9eb9a47d1fb98dab0a77d235e51ea9ae2326414..5a510410db13dd017dfea9bca141bae3b0cd6cdc 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(SalomeCOMPONENT C CXX)
 
-# Versioning
-# ===========
-# Project name, upper case
+# Project name
+# ============
+# original
+PROJECT(SalomeCOMPONENT 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}\"")
+
 # Find KERNEL
 # ===========
 SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")
@@ -135,7 +134,6 @@ ADD_SUBDIRECTORY(bin)
 
 # Header configuration
 # ====================
-SALOME_XVERSION(${PROJECT_NAME})
 SALOME_CONFIGURE_FILE(COMPONENT_version.h.in COMPONENT_version.h INSTALL ${SALOME_INSTALL_HEADERS})
 
 # Configuration export

diff --git a/bin/VERSION.in b/bin/VERSION.in
index ca9558a1e61b2841393a98df4a84a0807f6422f3..4bc567b4e820d43d05a10e8cb6f1eab86ba7a53a 100644 (file)
--- a/bin/VERSION.in
+++ b/bin/VERSION.in
@@ -1,3 +1,4 @@
 [SALOME COMPONENT] : @SALOMECOMPONENT_VERSION@
 [DEVELOPMENT]      : @SALOMECOMPONENT_VERSION_DEV@
+[SHA1]             : @SALOMECOMPONENT_GIT_SHA1@
 [DESCRIPTION]      : Sample SALOME module