X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSVTK%2FCMakeLists.txt;h=493e5651ced4e8d99dc0affcb0cb8057a3da3edb;hb=refs%2Fheads%2Fngr%2Fpython3_dev_pv5.4;hp=22a93e45d6ffd428f40a3dbd7fc9624726f4b5bc;hpb=d26f738c9c427a45409bacf3848fd8c224edf6ed;p=modules%2Fgui.git

diff --git a/src/SVTK/CMakeLists.txt b/src/SVTK/CMakeLists.txt
index 22a93e45d..493e5651c 100755
--- a/src/SVTK/CMakeLists.txt
+++ b/src/SVTK/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
+INCLUDE(UseQtExt)
 INCLUDE(${VTK_USE_FILE})
 
 # --- options ---
@@ -42,9 +42,9 @@ ADD_DEFINITIONS(${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS})
 
 # libraries to link to
 SET(_link_LIBRARIES 
-  ${QT_LIBRARIES} 
+  ${QT_LIBRARIES}
   ${OPENGL_LIBRARIES}
-  ${VTK_LIBRARIES} 
+  ${VTK_LIBRARIES}
   ${CAS_KERNEL} ${CAS_VIEWER}
   ${KERNEL_OpUtil}
   qtx suit ViewerTools SalomeObject SalomePrs VTKViewer OpenGLUtils
@@ -58,6 +58,7 @@ SET(_moc_HEADERS
    SVTK_FontWidget.h
    SVTK_GenericRenderWindowInteractor.h
    SVTK_RecorderDlg.h
+   SVTK_PsOptionsDlg.h	
    SVTK_RenderWindowInteractor.h
    SVTK_SetRotationPointDlg.h
    SVTK_View.h
@@ -105,8 +106,8 @@ SET(_other_HEADERS
 SET(_internal_HEADERS
   SVTK_SelectorDef.h
   SVTK_Trihedron.h
-  vtkPVAxesActor.h
-  vtkPVAxesWidget.h
+  salomevtkPVAxesActor.h
+  salomevtkPVAxesWidget.h
 )
 
 # header files / to install
@@ -139,6 +140,7 @@ SET(_other_RESOURCES
   resources/vtk_view_rotation_point.png
   resources/vtk_view_scaling.png
   resources/vtk_view_selection.png
+  resources/vtk_view_stereo.png
   resources/vtk_view_style_switch.png
   resources/vtk_view_update_rate.png
   resources/vtk_view_zooming_style_switch.png
@@ -147,7 +149,7 @@ SET(_other_RESOURCES
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS} ${_moc_internal_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS} ${_moc_internal_HEADERS})
 
 # sources / static
 SET(_other_SOURCES
@@ -168,6 +170,7 @@ SET(_other_SOURCES
   SVTK_Prs.cxx
   SVTK_Recorder.cxx
   SVTK_RecorderDlg.cxx
+  SVTK_PsOptionsDlg.cxx
   SVTK_RenderWindowInteractor.cxx
   SVTK_Renderer.cxx
   SVTK_Selector.cxx
@@ -181,8 +184,8 @@ SET(_other_SOURCES
   SVTK_ViewModel.cxx
   SVTK_ViewParameterDlg.cxx
   SVTK_ViewWindow.cxx
-  vtkPVAxesActor.cxx
-  vtkPVAxesWidget.cxx
+  salomevtkPVAxesActor.cxx
+  salomevtkPVAxesWidget.cxx
 )
 
 # sources / to compile
@@ -195,7 +198,6 @@ TARGET_LINK_LIBRARIES(SVTK ${_link_LIBRARIES})
 INSTALL(TARGETS SVTK EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 INSTALL(FILES ${SVTK_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
-QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")
 
 INSTALL(FILES ${_other_RESOURCES} DESTINATION ${SALOME_GUI_INSTALL_RES_DATA})
-