Salome HOME
Merge branch V7_6_BR
authorvsr <vsr@opencascade.com>
Wed, 3 Jun 2015 06:29:02 +0000 (09:29 +0300)
committervsr <vsr@opencascade.com>
Wed, 3 Jun 2015 06:31:41 +0000 (09:31 +0300)
1  2 
CMakeLists.txt
src/ResourcesManager/ResourcesManager.cxx

diff --cc CMakeLists.txt
index cd3e941390d56131c22ff876a25e2b554f5f3c2c,ab2e7838ee240c55416d685ccfcda8613c5436d4..0d198198a370b7319673c2cf05e5e569112de8d1
@@@ -30,11 -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 5)
- SET(${PROJECT_NAME_UC}_PATCH_VERSION 1)
+ SET(${PROJECT_NAME_UC}_MINOR_VERSION 6)
+ 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 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")