ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-11 16:19:17 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'vsr/26458'

Browse Source
This commit is contained in:
vsr 2021-10-04 20:46:46 +03:00
commit 9fddcc1f36
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CMakeLists.txt
View File

@ -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

1
bin/VERSION.in
View File

@ -1,3 +1,4 @@
[SALOME GEOM] : @SALOMEGEOM_VERSION@
[DEVELOPMENT] : @SALOMEGEOM_VERSION_DEV@
[DESCRIPTION] : SALOME Geometry module
[SHA1] : @SALOMEGEOM_GIT_SHA1@

2
src/GEOM_PY/CMakeLists.txt
View File

@ -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)

2
src/GEOM_PY/__init__.py
View File

@ -18,3 +18,5 @@
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
__version__ = "@SALOMEGEOM_GIT_SHA1@"