Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to paraview 5.4
[modules/gui.git]
/
src
/
VTKViewer
/
CMakeLists.txt
diff --git
a/src/VTKViewer/CMakeLists.txt
b/src/VTKViewer/CMakeLists.txt
index 3206949c52638414469c26ae7325e37fb8c8c207..7d0d468e2ab2562eb5f487ed441b97205cd1102f 100755
(executable)
--- a/
src/VTKViewer/CMakeLists.txt
+++ b/
src/VTKViewer/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-201
6
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
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-17,8
+17,8
@@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-INCLUDE(UseQt4Ext)
INCLUDE(${VTK_USE_FILE})
INCLUDE(${VTK_USE_FILE})
+INCLUDE(UseQtExt)
# --- options ---
# --- options ---
@@
-69,6
+69,7
@@
SET(_other_HEADERS
VTKViewer_InteractorStyle.h
VTKViewer_MarkerDef.h
VTKViewer_MarkerUtils.h
VTKViewer_InteractorStyle.h
VTKViewer_MarkerDef.h
VTKViewer_MarkerUtils.h
+ VTKViewer_OpenGLHelper.h
VTKViewer_OpenGLRenderer.h
VTKViewer_PolyDataMapper.h
VTKViewer_ShrinkFilter.h
VTKViewer_OpenGLRenderer.h
VTKViewer_PolyDataMapper.h
VTKViewer_ShrinkFilter.h
@@
-104,6
+105,7
@@
SET(_other_RESOURCES
resources/vtk_view_camera_dump.png
resources/vtk_view_fitall.png
resources/vtk_view_fitarea.png
resources/vtk_view_camera_dump.png
resources/vtk_view_fitall.png
resources/vtk_view_fitarea.png
+ resources/vtk_view_fitselection.png
resources/vtk_view_front.png
resources/vtk_view_glpan.png
resources/vtk_view_left.png
resources/vtk_view_front.png
resources/vtk_view_glpan.png
resources/vtk_view_left.png
@@
-127,11
+129,11
@@
SET(_other_RESOURCES
# --- sources ---
# --- sources ---
-# sources / rcc wrappings
-QT4_ADD_RESOURCES(_rcc_SOURCES ${_rcc_RESOURCES})
-
# sources / moc wrappings
# sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
+
+# sources / rcc wrappings
+QT_ADD_RESOURCES(_rcc_SOURCES ${_rcc_RESOURCES})
# sources / static
SET(_other_SOURCES
# sources / static
SET(_other_SOURCES
@@
-151,6
+153,7
@@
SET(_other_SOURCES
VTKViewer_MarkerDlg.cxx
VTKViewer_MarkerUtils.cxx
VTKViewer_MarkerWidget.cxx
VTKViewer_MarkerDlg.cxx
VTKViewer_MarkerUtils.cxx
VTKViewer_MarkerWidget.cxx
+ VTKViewer_OpenGLHelper.cxx
VTKViewer_OpenGLRenderer.cxx
VTKViewer_PolyDataMapper.cxx
VTKViewer_RenderWindow.cxx
VTKViewer_OpenGLRenderer.cxx
VTKViewer_PolyDataMapper.cxx
VTKViewer_RenderWindow.cxx
@@
-176,7
+179,7
@@
TARGET_LINK_LIBRARIES(VTKViewer ${_link_LIBRARIES})
INSTALL(TARGETS VTKViewer EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
INSTALL(FILES ${VTKViewer_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
INSTALL(TARGETS VTKViewer EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
INSTALL(FILES ${VTKViewer_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
-QT
4
_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})
FILE(GLOB GUIPNG_DATA "${CMAKE_CURRENT_SOURCE_DIR}/resources/*.png")
INSTALL(FILES ${_other_RESOURCES} DESTINATION ${SALOME_GUI_INSTALL_RES_DATA})
FILE(GLOB GUIPNG_DATA "${CMAKE_CURRENT_SOURCE_DIR}/resources/*.png")
@@
-188,5
+191,5
@@
INSTALL(FILES ${GUIVTI_DATA} DESTINATION ${SALOME_GUI_INSTALL_RES_DATA})
FILE(GLOB GUITXT_DATA "${CMAKE_CURRENT_SOURCE_DIR}/resources/*.txt")
INSTALL(FILES ${GUITXT_DATA} DESTINATION ${SALOME_GUI_INSTALL_RES_DATA})
FILE(GLOB GUITXT_DATA "${CMAKE_CURRENT_SOURCE_DIR}/resources/*.txt")
INSTALL(FILES ${GUITXT_DATA} DESTINATION ${SALOME_GUI_INSTALL_RES_DATA})
-
-
+FILE(GLOB GUIGLSL_DATA "${CMAKE_CURRENT_SOURCE_DIR}/resources/*.glsl")
+INSTALL(FILES ${GUIGLSL_DATA} DESTINATION ${SALOME_GUI_INSTALL_RES_DATA})