From: vsr <vsr@opencascade.com>
Date: Fri, 10 Dec 2021 09:41:38 +0000 (+0300)
Subject: Merge branch 'V9_8_BR'
X-Git-Tag: V9_9_0a1^0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c85ca3d0f683f44d119b5f3b6423416e611af5cd;p=samples%2Fpycalculator.git

Merge branch 'V9_8_BR'
---

c85ca3d0f683f44d119b5f3b6423416e611af5cd
diff --cc CMakeLists.txt
index c9cec36,55e885f..89486ac
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -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")