Merge branch 'master' into agy/NewPV1_For_850

[modules/gui.git] / src / SVTK / CMakeLists.txt

diff --git a/src/SVTK/CMakeLists.txt b/src/SVTK/CMakeLists.txt
index 7e1b1d3249f9ac2e2046c734246fc467ba86091e..611319e1444e8bbd0380b036fd1839fd8b26177e 100755 (executable)
--- a/src/SVTK/CMakeLists.txt
+++ b/src/SVTK/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -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 ---
@@ -27,7 +27,7 @@ INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
   ${QT_INCLUDES}
   ${Boost_INCLUDE_DIRS}
-  ${KERNEL_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${PROJECT_SOURCE_DIR}/src/Qtx
   ${PROJECT_SOURCE_DIR}/src/SUIT
   ${PROJECT_SOURCE_DIR}/src/ViewerTools
@@ -42,10 +42,11 @@ 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
 )
 
@@ -57,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
@@ -97,6 +99,7 @@ SET(_other_HEADERS
    SVTK_Selector.h
    SVTK_SpaceMouse.h
    SVTK_Utils.h
+   SVTK_Hash.h
 )
 
 # header files / no moc processing / internal
@@ -104,8 +107,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
@@ -138,6 +141,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
@@ -146,7 +150,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
@@ -167,6 +171,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
@@ -180,8 +185,8 @@ SET(_other_SOURCES
   SVTK_ViewModel.cxx
   SVTK_ViewParameterDlg.cxx
   SVTK_ViewWindow.cxx
-  vtkPVAxesActor.cxx
-  vtkPVAxesWidget.cxx
+  salomevtkPVAxesActor.cxx
+  salomevtkPVAxesWidget.cxx
 )
 
 # sources / to compile
@@ -194,7 +199,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})
-