From: vsr Date: Thu, 15 Oct 2015 05:56:45 +0000 (+0300) Subject: Increment version: 7.7.0 X-Git-Tag: V7_7_0rc1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f1d439b59670a6bd8f08a7a6bb54059ae853bb30;p=modules%2Fkernel.git Increment version: 7.7.0 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 04bf3d530..478a3f988 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,11 +30,11 @@ CMAKE_POLICY(SET CMP0003 NEW) STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7) -SET(${PROJECT_NAME_UC}_MINOR_VERSION 6) +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) +SET(${PROJECT_NAME_UC}_VERSION_DEV 0) # Our own set of macros: LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/salome_adm/cmake_files") diff --git a/salome_adm/cmake_files/deprecated/am2cmake.py b/salome_adm/cmake_files/deprecated/am2cmake.py index 9b00f7529..3837dd5d4 100644 --- a/salome_adm/cmake_files/deprecated/am2cmake.py +++ b/salome_adm/cmake_files/deprecated/am2cmake.py @@ -816,9 +816,9 @@ class CMakeFile(object): pass # -- newlines.append(""" - set(VERSION 7.6.0) - set(SHORT_VERSION 7.6) - set(XVERSION 0x070600) + set(VERSION 7.7.0) + set(SHORT_VERSION 7.7) + set(XVERSION 0x070700) set(VERSION_DEV 0) """) pass