Salome HOME
projects
/
modules
/
med.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a504b59
)
Increment version: 9.8.0
V9_8_BR
V9_8_0
V9_8_0rc1
author
vsr
<vsr@opencascade.com>
Fri, 26 Nov 2021 10:21:46 +0000
(13:21 +0300)
committer
vsr
<vsr@opencascade.com>
Sat, 27 Nov 2021 09:52:51 +0000
(12:52 +0300)
CMakeLists.txt
patch
|
blob
|
history
VERSION.in
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 9fc267cc4b4be713d9f8e3510a69419347eae936..3fe938aea78e18c77d728ea6cf10a1c15949a45c 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-19,20
+19,14
@@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
INCLUDE(CMakeDependentOption)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
INCLUDE(CMakeDependentOption)
-PROJECT(SalomeFIELDS C CXX)
-# Versioning
-# ===========
-# Project name, upper case
+# Project name
+# ============
+# original
+PROJECT(SalomeFIELDS C CXX)
+# upper case
STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
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")
# Common CMake macros
# ===================
SET(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake configuration files")
@@
-43,6
+37,11
@@
ELSE()
MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !")
ENDIF()
MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !")
ENDIF()
+# Versioning
+# ===========
+SALOME_SETUP_VERSION(9.8.0)
+MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"")
+
#
# Kernel detection comes before user options to be
# able to take previous values of global options ...
#
# Kernel detection comes before user options to be
# able to take previous values of global options ...
@@
-191,7
+190,6
@@
MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED SALOME_FIELD
# Header configuration
# ====================
# Header configuration
# ====================
-SALOME_XVERSION(${PROJECT_NAME})
SALOME_CONFIGURE_FILE(FIELDS_version.h.in FIELDS_version.h INSTALL ${SALOME_INSTALL_HEADERS})
SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS})
SALOME_CONFIGURE_FILE(FIELDS_version.h.in FIELDS_version.h INSTALL ${SALOME_INSTALL_HEADERS})
SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS})
diff --git
a/VERSION.in
b/VERSION.in
index 5a844624771d47a8025f043d10542666407237a1..13bbaa18f64556c418b8ee9a686468e13b27e077 100644
(file)
--- a/
VERSION.in
+++ b/
VERSION.in
@@
-1,3
+1,4
@@
[SALOME FIELDS] : @SALOMEFIELDS_VERSION@
[DEVELOPMENT] : @SALOMEFIELDS_VERSION_DEV@
[SALOME FIELDS] : @SALOMEFIELDS_VERSION@
[DEVELOPMENT] : @SALOMEFIELDS_VERSION_DEV@
+[SHA1] : @SALOMEFIELDS_GIT_SHA1@
[DESCRIPTION] : SALOME FIELDS module
[DESCRIPTION] : SALOME FIELDS module