Merge branch V7_3_1_BR

This commit is contained in:
vsr 2014-04-03 15:51:28 +04:00
commit 147970666c

View File

@ -29,7 +29,7 @@ STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7) SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
SET(${PROJECT_NAME_UC}_MINOR_VERSION 3) SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
SET(${PROJECT_NAME_UC}_PATCH_VERSION 0) SET(${PROJECT_NAME_UC}_PATCH_VERSION 1)
SET(${PROJECT_NAME_UC}_VERSION SET(${PROJECT_NAME_UC}_VERSION
${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION}) ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
SET(${PROJECT_NAME_UC}_VERSION_DEV 1) SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
@ -110,7 +110,7 @@ ENDIF(SALOME_BUILD_GUI)
# OCCT # OCCT
FIND_PACKAGE(SalomeCAS REQUIRED) FIND_PACKAGE(SalomeCAS REQUIRED)
# VTK # VTK
FIND_PACKAGE(SalomeVTK 6.0 REQUIRED) FIND_PACKAGE(SalomeVTK 6.1 REQUIRED)
# Find GEOM # Find GEOM