From: vsr Date: Fri, 27 Jun 2014 10:11:13 +0000 (+0400) Subject: Version update: 7.4.1 X-Git-Tag: V7_4_1rc1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=af1790b175fcfd5f3878978b8b29d570ffd54fb7;p=modules%2Fkernel.git Version update: 7.4.1 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 91c7aaefd..b49d2d4c7 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,7 @@ 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 0) +SET(${PROJECT_NAME_UC}_PATCH_VERSION 1) 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 0) diff --git a/salome_adm/cmake_files/deprecated/am2cmake.py b/salome_adm/cmake_files/deprecated/am2cmake.py index 6c45fd2a6..d48920c46 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.4.0) + set(VERSION 7.4.1) set(SHORT_VERSION 7.4) - set(XVERSION 0x070400) + set(XVERSION 0x070401) set(VERSION_DEV 0) """) pass