From: vsr <vsr@opencascade.com>
Date: Fri, 10 Dec 2021 09:28:48 +0000 (+0300)
Subject: Merge branch 'V9_8_BR'
X-Git-Tag: V9_9_0a1~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=60c79938d58351c16ebf644e2a508c53cb744d43;hp=-c;p=plugins%2Fghs3dplugin.git

Merge branch 'V9_8_BR'
---

60c79938d58351c16ebf644e2a508c53cb744d43
diff --combined CMakeLists.txt
index 8d4e2d7,81d3f39..0e789ac
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -17,20 -17,14 +17,14 @@@
  # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
  #
  CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
- PROJECT(SalomeGHS3DPLUGIN C CXX)
  
- # Versioning
- # ===========
- # Project name, upper case
+ # Project name
+ # ============
+ # original
+ PROJECT(SalomeGHS3DPLUGIN 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")
@@@ -41,6 -35,11 +35,11 @@@ ELSE(
    MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !")
  ENDIF()
  
+ # Versioning
+ # ===========
 -SALOME_SETUP_VERSION(9.8.0)
++SALOME_SETUP_VERSION(9.8.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")
@@@ -221,7 -220,6 +220,6 @@@ ENDIF(SALOME_BUILD_DOC
  
  # Header configuration
  # ====================
- SALOME_XVERSION(${PROJECT_NAME})
  SALOME_CONFIGURE_FILE(GHS3DPLUGIN_version.h.in GHS3DPLUGIN_version.h INSTALL ${SALOME_INSTALL_HEADERS})
  
  # Configuration export