-# Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-INCLUDE(UseQt4Ext)
+INCLUDE(UseQtExt)
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
- ${CAS_INCLUDE_DIRS}
+ ${OpenCASCADE_INCLUDE_DIR}
${OGL_INCLUDE_DIRS}
${QT_INCLUDES}
${PTHREAD_INCLUDE_DIR}
)
# additional preprocessor / compiler flags
-ADD_DEFINITIONS(${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${OGL_DEFINITIONS})
+ADD_DEFINITIONS(${QT_DEFINITIONS} ${OpenCASCADE_DEFINITIONS} ${OGL_DEFINITIONS})
# libraries to link to
SET(_link_LIBRARIES
- ${OPENGL_LIBRARIES} ${QT_LIBRARIES} ${CAS_KERNEL} ${CAS_VIEWER} ${CAS_TKGeomAlgo}
- ${CAS_TKTopAlgo} ${CAS_TKG2d} ${CAS_TKOpenGl}
+ ${OPENGL_LIBRARIES} ${QT_LIBRARIES}
+ ${OpenCASCADE_FoundationClasses_LIBRARIES}
+ ${OpenCASCADE_ModelingData_LIBRARIES}
+ ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
+ ${OpenCASCADE_Visualization_LIBRARIES}
CASCatch qtx suit ViewerTools ViewerData OpenGLUtils
)
OCCViewer_AISSelector.h
OCCViewer_AxialScaleDlg.h
OCCViewer_ClippingDlg.h
+ OCCViewer_RayTracingDlg.h
+ OCCViewer_EnvTextureDlg.h
+ OCCViewer_LightSourceDlg.h
OCCViewer_CreateRestoreViewDlg.h
OCCViewer_CubeAxesDlg.h
OCCViewer_FontWidget.h
SET(_other_HEADERS
OCCViewer.h
OCCViewer_ClipPlane.h
- OCCViewer_Trihedron.h
OCCViewer_VService.h
OCCViewer_Utilities.h
)
resources/occ_view_scaling.png
resources/occ_view_selection.png
resources/occ_view_shoot.png
+ resources/occ_view_stereo.png
resources/occ_view_style_switch.png
resources/occ_view_top.png
resources/occ_view_triedre.png
resources/occ_view_zoom.png
resources/occ_view_zooming_style_switch.png
+ resources/occ_view_ray_tracing.png
+ resources/occ_view_env_texture.png
+ resources/occ_view_light_source.png
)
# --- sources ---
# sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
# sources / rcc wrappings
-QT4_ADD_RESOURCES(_rcc_SOURCES ${_rcc_RESOURCES})
+QT_ADD_RESOURCES(_rcc_SOURCES ${_rcc_RESOURCES})
# sources / static
SET(_other_SOURCES
+ OCCViewer.cxx
OCCViewer_AISSelector.cxx
OCCViewer_AxialScaleDlg.cxx
OCCViewer_ClippingDlg.cxx
+ OCCViewer_RayTracingDlg.cxx
+ OCCViewer_EnvTextureDlg.cxx
+ OCCViewer_LightSourceDlg.cxx
OCCViewer_ClipPlane.cxx
OCCViewer_CreateRestoreViewDlg.cxx
OCCViewer_CubeAxesDlg.cxx
OCCViewer_FontWidget.cxx
OCCViewer_SetRotationPointDlg.cxx
OCCViewer_ToolTip.cxx
- OCCViewer_Trihedron.cxx
OCCViewer_VService.cxx
OCCViewer_ViewFrame.cxx
OCCViewer_ViewManager.cxx
INSTALL(TARGETS OCCViewer EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
INSTALL(FILES ${OCCViewer_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})