From: vsr <vsr@opencascade.com>
Date: Mon, 4 Oct 2021 17:46:46 +0000 (+0300)
Subject: Merge branch 'vsr/26458'
X-Git-Tag: V9_8_0a1^0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9fddcc1f3675b27854f296d32a978539522a8959;hp=6a0d013cc0c797594231ce52caf17c9f07e9439b;p=modules%2Fgeom.git

Merge branch 'vsr/26458'
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e1171b4d..c92530fca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,20 +19,13 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
 INCLUDE(CMakeDependentOption)
 
+# Project name
+# ============
+# original
 PROJECT(SalomeGEOM 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")
@@ -43,6 +36,11 @@ ELSE()
   MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !")
 ENDIF()
 
+# Versioning
+# ===========
+SALOME_SETUP_VERSION(9.7.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")
@@ -216,7 +214,6 @@ ENDIF()
 
 # Header configuration
 # ====================
-SALOME_XVERSION(${PROJECT_NAME})
 SALOME_CONFIGURE_FILE(GEOM_version.h.in GEOM_version.h INSTALL ${SALOME_INSTALL_HEADERS})
 
 # Configuration export
diff --git a/bin/VERSION.in b/bin/VERSION.in
index 2fc977aac..d407341a4 100644
--- a/bin/VERSION.in
+++ b/bin/VERSION.in
@@ -1,3 +1,4 @@
 [SALOME GEOM] : @SALOMEGEOM_VERSION@
 [DEVELOPMENT] : @SALOMEGEOM_VERSION_DEV@
 [DESCRIPTION] : SALOME Geometry module
+[SHA1]        : @SALOMEGEOM_GIT_SHA1@
diff --git a/src/GEOM_PY/CMakeLists.txt b/src/GEOM_PY/CMakeLists.txt
index 1844a9523..5d8954932 100644
--- a/src/GEOM_PY/CMakeLists.txt
+++ b/src/GEOM_PY/CMakeLists.txt
@@ -22,7 +22,6 @@ ADD_SUBDIRECTORY( structelem )
 # scripts / python
 
 SET(_python_SCRIPTS
-  __init__.py
   geomtools.py
   sketcher.py
   )
@@ -30,3 +29,4 @@ SET(_python_SCRIPTS
 # --- rules ---
 
 SALOME_INSTALL_SCRIPTS("${_python_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom)
+SALOME_CONFIGURE_FILE(__init__.py __init__.py INSTALL ${SALOME_INSTALL_PYTHON}/salome/geom)
diff --git a/src/GEOM_PY/__init__.py b/src/GEOM_PY/__init__.py
index 9b556047a..04fff6f50 100644
--- a/src/GEOM_PY/__init__.py
+++ b/src/GEOM_PY/__init__.py
@@ -18,3 +18,5 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
+__version__ = "@SALOMEGEOM_GIT_SHA1@"