From: vsr Date: Fri, 18 Apr 2014 11:30:16 +0000 (+0400) Subject: Increment version: 7.4.0 X-Git-Tag: V7_4_0rc1~12^2~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e19a0efb491d5e4dc7e81b79d5f1a69ab1270061;p=modules%2Fkernel.git Increment version: 7.4.0 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index bb1b84bc1..91c7aaefd 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 3) -SET(${PROJECT_NAME_UC}_PATCH_VERSION 1) +SET(${PROJECT_NAME_UC}_MINOR_VERSION 4) +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 2c992011a..6c45fd2a6 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.3.1) - set(SHORT_VERSION 7.3) - set(XVERSION 0x070301) + set(VERSION 7.4.0) + set(SHORT_VERSION 7.4) + set(XVERSION 0x070400) set(VERSION_DEV 0) """) pass