From: vsr Date: Wed, 20 Mar 2013 09:16:32 +0000 (+0000) Subject: Increment version of 7.1.0 X-Git-Tag: V7_1_0 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5f278c29eb0d22d9010b411ca361ae65a3a9564e;p=modules%2Fkernel.git Increment version of 7.1.0 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 4200f7d83..48509f1d8 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,8 +50,8 @@ SET(WITH_LOCAL 1) SET(WITH_BATCH 1) ENABLE_TESTING() -SET(VERSION "7.0.0") -SET(VERSION_DEV "1") +SET(VERSION "7.1.0") +SET(VERSION_DEV "0") SET(BUILD_SHARED_LIBS true) diff --git a/configure.ac b/configure.ac index 4c9479c6e..608e6c463 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ # ================================================================ #AC_PREREQ(2.59) # -AC_INIT([Salome2 Project], [7.0.0], [paul.rascle@edf.fr], [SalomeKERNEL]) +AC_INIT([Salome2 Project], [7.1.0], [paul.rascle@edf.fr], [SalomeKERNEL]) # AC_CONFIG_AUX_DIR defines an alternative directory where to find the auxiliary # scripts such as config.guess, install-sh, ... @@ -37,7 +37,7 @@ AM_INIT_AUTOMAKE([tar-pax -Wno-portability]) XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'` AC_SUBST(XVERSION) -VERSION_DEV=1 +VERSION_DEV=0 AC_SUBST(VERSION_DEV) # set up MODULE_NAME variable for dynamic construction of directories (resources, etc.) diff --git a/salome_adm/cmake_files/deprecated/am2cmake.py b/salome_adm/cmake_files/deprecated/am2cmake.py index b8551936d..ff5aba2a1 100644 --- a/salome_adm/cmake_files/deprecated/am2cmake.py +++ b/salome_adm/cmake_files/deprecated/am2cmake.py @@ -809,10 +809,10 @@ class CMakeFile(object): pass # -- newlines.append(""" - set(VERSION 7.0.0) - set(SHORT_VERSION 7.0) - set(XVERSION 0x070000) - set(VERSION_DEV 1) + set(VERSION 7.1.0) + set(SHORT_VERSION 7.1) + set(XVERSION 0x070100) + set(VERSION_DEV 0) """) pass # --