]> SALOME platform Git repositories - samples/atomsolv.git/commitdiff
Salome HOME
Merge branch V7_3_1_BR V7_4_0a1 V7_4_0b1
authorvsr <vsr@opencascade.com>
Thu, 3 Apr 2014 11:43:06 +0000 (15:43 +0400)
committervsr <vsr@opencascade.com>
Thu, 3 Apr 2014 11:43:06 +0000 (15:43 +0400)
CMakeLists.txt

index 776898143f622c6a9bc6ab362adf22241b5e89b7..2a15a285f5cda9735ef6699c0a5142fa3653be22 100755 (executable)
@@ -29,7 +29,7 @@ STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 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 1)
@@ -87,7 +87,7 @@ ENDIF(EXISTS ${GUI_ROOT_DIR})
 ## From GUI:
 ##
 FIND_PACKAGE(SalomeCAS REQUIRED)
-FIND_PACKAGE(SalomeVTK 6.0 REQUIRED)
+FIND_PACKAGE(SalomeVTK 6.1 REQUIRED)
 FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
 INCLUDE(${QT_USE_FILE})
 
@@ -203,4 +203,4 @@ INSTALL(FILES
 
 # Install the export set for use with the install-tree
 INSTALL(EXPORT ${PROJECT_NAME}TargetGroup DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}" 
-  FILE ${PROJECT_NAME}Targets.cmake)
\ No newline at end of file
+  FILE ${PROJECT_NAME}Targets.cmake)