From: vsr Date: Wed, 5 Nov 2014 15:21:42 +0000 (+0300) Subject: Increment version: 7.5.0 X-Git-Tag: V7_5_0rc1~3 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f9c977620434681b9738b35c3000a43e8b2bbe95;p=modules%2Fkernel.git Increment version: 7.5.0 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ef93d381..cbfce5af1 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 4) -SET(${PROJECT_NAME_UC}_PATCH_VERSION 1) +SET(${PROJECT_NAME_UC}_MINOR_VERSION 5) +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 b864b8879..2a220ef62 100644 --- a/salome_adm/cmake_files/deprecated/am2cmake.py +++ b/salome_adm/cmake_files/deprecated/am2cmake.py @@ -816,10 +816,10 @@ class CMakeFile(object): pass # -- newlines.append(""" - set(VERSION 7.4.1) - set(SHORT_VERSION 7.4) - set(XVERSION 0x070401) - set(VERSION_DEV 1) + set(VERSION 7.5.0) + set(SHORT_VERSION 7.5) + set(XVERSION 0x070500) + set(VERSION_DEV 0) """) pass # --