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

Merge branch 'vsr/26458'
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 68f91de51..2f4705da4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,22 +17,15 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
-PROJECT(SalomeSMESH C CXX)
-
 INCLUDE(CMakeDependentOption)
 
-# Versioning
-# ===========
-# Project name, upper case
+# Project name
+# ============
+# original
+PROJECT(SalomeSMESH 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 +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")
@@ -328,7 +326,6 @@ ENDIF()
 
 # Header configuration
 # ====================
-SALOME_XVERSION(${PROJECT_NAME})
 SALOME_CONFIGURE_FILE(SMESH_version.h.in SMESH_version.h INSTALL ${SALOME_INSTALL_HEADERS})
 
 # Configuration export
diff --git a/bin/VERSION.in b/bin/VERSION.in
index 587f19c1f..73c769017 100644
--- a/bin/VERSION.in
+++ b/bin/VERSION.in
@@ -1,3 +1,4 @@
 [SALOME SMESH] : @SALOMESMESH_VERSION@
 [DEVELOPMENT]  : @SALOMESMESH_VERSION_DEV@
 [DESCRIPTION]  : SALOME Mesh module
+[SHA1]         : @SALOMESMESH_GIT_SHA1@
diff --git a/src/SMESH_PY/CMakeLists.txt b/src/SMESH_PY/CMakeLists.txt
index b6b47fa56..2150a6363 100644
--- a/src/SMESH_PY/CMakeLists.txt
+++ b/src/SMESH_PY/CMakeLists.txt
@@ -21,10 +21,10 @@
 
 # scripts / static
 SET(_bin_SCRIPTS
-  __init__.py
   smeshstudytools.py
 )
 
 # --- rules ---
 
-SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/smesh)
\ No newline at end of file
+SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/smesh)
+SALOME_CONFIGURE_FILE(__init__.py __init__.py INSTALL ${SALOME_INSTALL_PYTHON}/salome/smesh)
diff --git a/src/SMESH_PY/__init__.py b/src/SMESH_PY/__init__.py
index 965aaa4fb..0d138181a 100644
--- a/src/SMESH_PY/__init__.py
+++ b/src/SMESH_PY/__init__.py
@@ -18,3 +18,4 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+__version__ = "@SALOMESMESH_GIT_SHA1@"