From: vsr Date: Fri, 10 Dec 2021 09:18:00 +0000 (+0300) Subject: Merge branch 'V9_8_BR' X-Git-Tag: V9_9_0b1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e8f14b648a9aa3779097ac8dafa2d6bb90d071ba;p=tools%2Fdocumentation.git Merge branch 'V9_8_BR' --- cf1b0978a57e979ffb52c1ea5ce0fa34822a8844 diff --cc CMakeLists.txt index 9957c65,81ba58e..180c14f --- a/CMakeLists.txt +++ b/CMakeLists.txt @@@ -43,6 -36,11 +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.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}\"") + # Platform setup # ============== LIST(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)