]> SALOME platform Git repositories - modules/gui.git/commitdiff
Salome HOME
Merge remote branch 'origin/abn/newpy_pv4-1' into V7_3_1_BR
authorvsr <vsr@opencascade.com>
Wed, 19 Feb 2014 07:47:10 +0000 (11:47 +0400)
committervsr <vsr@opencascade.com>
Wed, 19 Feb 2014 07:47:10 +0000 (11:47 +0400)
1  2 
CMakeLists.txt

diff --combined CMakeLists.txt
index d80cfbbd89cfec1bac6f1e4a6a40ff18d7e844f4,fc3dfc23dc3d609ffd6bfb27c0ea97f7bba8303f..ea1c754ea334b5efddadcc4fe19d83637bd78902
@@@ -29,7 -29,7 +29,7 @@@ STRING(TOUPPER ${PROJECT_NAME} PROJECT_
  
  SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
  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
    ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
  SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
@@@ -138,7 -138,7 +138,7 @@@ IF(SALOME_USE_GLVIEWER
  ENDIF()
  IF(SALOME_USE_VTKVIEWER)
    # Required components are listed in the FindSalomeVTK.cmake file: 
-   FIND_PACKAGE(SalomeVTK 6.0
+   FIND_PACKAGE(SalomeVTK 6.1
    SALOME_LOG_OPTIONAL_PACKAGE(VTK SALOME_USE_VTKVIEWER)
  ENDIF()
  IF(SALOME_USE_PLOT2DVIEWER)