From 4dfdb13cdeec6b23b05fc82fcfe7e05b7cdea9be Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 19 Nov 2012 11:12:34 +0000 Subject: [PATCH] Increment version to 6.6.0 --- CMakeLists.txt | 4 ++-- configure.ac | 4 ++-- salome_adm/cmake_files/am2cmake.py | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 80dd89acf..e9f020b3f 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,8 +37,8 @@ SET(WITH_LOCAL 1) SET(WITH_BATCH 1) ENABLE_TESTING() -SET(VERSION "6.5.0") -SET(VERSION_DEV "1") +SET(VERSION "6.6.0") +SET(VERSION_DEV "0") INCLUDE(${CMAKE_SOURCE_DIR}/salome_adm/cmake_files/FindPLATFORM.cmake) INCLUDE(${CMAKE_SOURCE_DIR}/salome_adm/cmake_files/FindPYTHON.cmake) diff --git a/configure.ac b/configure.ac index e8d2e1458..f2f139020 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ # ================================================================ #AC_PREREQ(2.59) # -AC_INIT([Salome2 Project], [6.5.0], [paul.rascle@edf.fr], [SalomeKERNEL]) +AC_INIT([Salome2 Project], [6.6.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/am2cmake.py b/salome_adm/cmake_files/am2cmake.py index 138248109..f502a6310 100644 --- a/salome_adm/cmake_files/am2cmake.py +++ b/salome_adm/cmake_files/am2cmake.py @@ -802,10 +802,10 @@ class CMakeFile(object): pass # -- newlines.append(""" - set(VERSION 6.5.0) - set(SHORT_VERSION 6.5) - set(XVERSION 0x060500) - set(VERSION_DEV 1) + set(VERSION 6.6.0) + set(SHORT_VERSION 6.6) + set(XVERSION 0x060600) + set(VERSION_DEV 0) """) pass # -- -- 2.39.2