From: vsr Date: Thu, 28 Aug 2014 09:09:38 +0000 (+0400) Subject: Switch on dev version flag X-Git-Tag: V7_5_0a1~9 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e13cdfb088702e061db7ecd6dda0d0b68a351b43;p=modules%2Fkernel.git Switch on dev version flag --- diff --git a/CMakeLists.txt b/CMakeLists.txt index b49d2d4c7..26de8514e 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,7 @@ SET(${PROJECT_NAME_UC}_MINOR_VERSION 4) 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) +SET(${PROJECT_NAME_UC}_VERSION_DEV 1) # 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 d48920c46..b864b8879 100644 --- a/salome_adm/cmake_files/deprecated/am2cmake.py +++ b/salome_adm/cmake_files/deprecated/am2cmake.py @@ -819,7 +819,7 @@ class CMakeFile(object): set(VERSION 7.4.1) set(SHORT_VERSION 7.4) set(XVERSION 0x070401) - set(VERSION_DEV 0) + set(VERSION_DEV 1) """) pass # --