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
ZFitAll leads to black screen of OCC viewer during rotation if gradient background...
[modules/gui.git]
/
src
/
OCCViewer
/
CMakeLists.txt
diff --git
a/src/OCCViewer/CMakeLists.txt
b/src/OCCViewer/CMakeLists.txt
index e3282c54c6150b7602d1a7b1fff9b1c96548843b..837b6f2c034370fb1338bb6a5288caa6b0810f3e 100755
(executable)
--- a/
src/OCCViewer/CMakeLists.txt
+++ b/
src/OCCViewer/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-201
6
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
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-20,7
+20,7
@@
# 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(UseQt
4
Ext)
+INCLUDE(UseQtExt)
# --- options ---
# --- options ---
@@
-32,10
+32,10
@@
INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR}
${PROJECT_SOURCE_DIR}/src/CASCatch
${PROJECT_SOURCE_DIR}/src/Qtx
${PTHREAD_INCLUDE_DIR}
${PROJECT_SOURCE_DIR}/src/CASCatch
${PROJECT_SOURCE_DIR}/src/Qtx
- ${PROJECT_SOURCE_DIR}/src/OpenGLUtils
${PROJECT_SOURCE_DIR}/src/SUIT
${PROJECT_SOURCE_DIR}/src/ViewerData
${PROJECT_SOURCE_DIR}/src/ViewerTools
${PROJECT_SOURCE_DIR}/src/SUIT
${PROJECT_SOURCE_DIR}/src/ViewerData
${PROJECT_SOURCE_DIR}/src/ViewerTools
+ ${PROJECT_SOURCE_DIR}/src/OpenGLUtils
)
# additional preprocessor / compiler flags
)
# additional preprocessor / compiler flags
@@
-45,7
+45,7
@@
ADD_DEFINITIONS(${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${OGL_DEFINITIONS})
SET(_link_LIBRARIES
${OPENGL_LIBRARIES} ${QT_LIBRARIES} ${CAS_KERNEL} ${CAS_VIEWER} ${CAS_TKGeomAlgo}
${CAS_TKTopAlgo} ${CAS_TKG2d} ${CAS_TKOpenGl}
SET(_link_LIBRARIES
${OPENGL_LIBRARIES} ${QT_LIBRARIES} ${CAS_KERNEL} ${CAS_VIEWER} ${CAS_TKGeomAlgo}
${CAS_TKTopAlgo} ${CAS_TKG2d} ${CAS_TKOpenGl}
- CASCatch qtx suit
OpenGLUtils ViewerTools ViewerData
+ CASCatch qtx suit
ViewerTools ViewerData OpenGLUtils
)
# --- headers ---
)
# --- headers ---
@@
-55,6
+55,9
@@
SET(_moc_HEADERS
OCCViewer_AISSelector.h
OCCViewer_AxialScaleDlg.h
OCCViewer_ClippingDlg.h
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
OCCViewer_CreateRestoreViewDlg.h
OCCViewer_CubeAxesDlg.h
OCCViewer_FontWidget.h
@@
-75,7
+78,6
@@
SET(_moc_HEADERS
SET(_other_HEADERS
OCCViewer.h
OCCViewer_ClipPlane.h
SET(_other_HEADERS
OCCViewer.h
OCCViewer_ClipPlane.h
- OCCViewer_Trihedron.h
OCCViewer_VService.h
OCCViewer_Utilities.h
)
OCCViewer_VService.h
OCCViewer_Utilities.h
)
@@
-135,33
+137,40
@@
SET(_other_RESOURCES
resources/occ_view_scaling.png
resources/occ_view_selection.png
resources/occ_view_shoot.png
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_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
)
# --- sources ---
# sources / moc wrappings
-QT
4_WRAP_CPP
(_moc_SOURCES ${_moc_HEADERS})
+QT
_WRAP_MOC
(_moc_SOURCES ${_moc_HEADERS})
# sources / rcc wrappings
# sources / rcc wrappings
-QT
4
_ADD_RESOURCES(_rcc_SOURCES ${_rcc_RESOURCES})
+QT_ADD_RESOURCES(_rcc_SOURCES ${_rcc_RESOURCES})
# sources / static
SET(_other_SOURCES
# sources / static
SET(_other_SOURCES
+ OCCViewer.cxx
OCCViewer_AISSelector.cxx
OCCViewer_AxialScaleDlg.cxx
OCCViewer_ClippingDlg.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_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
OCCViewer_VService.cxx
OCCViewer_ViewFrame.cxx
OCCViewer_ViewManager.cxx
@@
-185,6
+194,6
@@
TARGET_LINK_LIBRARIES(OCCViewer ${_link_LIBRARIES})
INSTALL(TARGETS OCCViewer EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
INSTALL(FILES ${OCCViewer_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
INSTALL(TARGETS OCCViewer EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
INSTALL(FILES ${OCCViewer_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})
INSTALL(FILES ${_other_RESOURCES} DESTINATION ${SALOME_GUI_INSTALL_RES_DATA})