Salome HOME
projects
/
plugins
/
netgenplugin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8ca0ca1
)
Increment version: 9.8.0
author
vsr
<vsr@opencascade.com>
Fri, 26 Nov 2021 10:21:47 +0000
(13:21 +0300)
committer
vsr
<vsr@opencascade.com>
Sat, 27 Nov 2021 09:55:33 +0000
(12:55 +0300)
CMakeLists.txt
patch
|
blob
|
history
bin/VERSION.in
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index a8abc9a4699e60158d7cf3b7d8bd115f04c9dda2..a83f142492044c0a2624053076991435fb82a9e7 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)
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
-PROJECT(SalomeNETGENPLUGIN C CXX)
-# Versioning
-# ===========
-# Project name, upper case
+# Project name
+# ============
+# original
+PROJECT(SalomeNETGENPLUGIN 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")
@@
-41,6
+35,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}\"")
+
# Find KERNEL
# ===========
SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")
# Find KERNEL
# ===========
SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")
@@
-222,7
+221,6
@@
ENDIF(SALOME_BUILD_DOC)
# Header configuration
# ====================
# Header configuration
# ====================
-SALOME_XVERSION(${PROJECT_NAME})
SALOME_CONFIGURE_FILE(NETGENPLUGIN_version.h.in NETGENPLUGIN_version.h INSTALL ${SALOME_INSTALL_HEADERS})
# Configuration export
SALOME_CONFIGURE_FILE(NETGENPLUGIN_version.h.in NETGENPLUGIN_version.h INSTALL ${SALOME_INSTALL_HEADERS})
# Configuration export
diff --git
a/bin/VERSION.in
b/bin/VERSION.in
index e88ff9f245f57ffb040a683af89793e7c1e2eefc..e82b1895c16968e3ef3d8ae5b8a44bbfd4a6a09b 100644
(file)
--- a/
bin/VERSION.in
+++ b/
bin/VERSION.in
@@
-1,3
+1,4
@@
[SALOME NETGENPLUGIN] : @SALOMENETGENPLUGIN_VERSION@
[DEVELOPMENT] : @SALOMENETGENPLUGIN_VERSION_DEV@
[SALOME NETGENPLUGIN] : @SALOMENETGENPLUGIN_VERSION@
[DEVELOPMENT] : @SALOMENETGENPLUGIN_VERSION_DEV@
+[SHA1] : @SALOMENETGENPLUGIN_GIT_SHA1@
[DESCRIPTION] : Netgen meshing plug-in for SALOME Mesh module
[DESCRIPTION] : Netgen meshing plug-in for SALOME Mesh module