X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FOCCViewer%2FCMakeLists.txt;h=8c4159c850274bf3be17f139f13de2d3b5fbb073;hb=77a9b7ac9d8b364358e1760e74a44e86557b79aa;hp=2c0c604979c010ccb9fecc1f9560cedd8cd9291b;hpb=1b1d2f5174e168e017ddae3a592f13f3e6835d4d;p=modules%2Fgui.git

diff --git a/src/OCCViewer/CMakeLists.txt b/src/OCCViewer/CMakeLists.txt
index 2c0c60497..8c4159c85 100755
--- a/src/OCCViewer/CMakeLists.txt
+++ b/src/OCCViewer/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2015  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
@@ -6,7 +6,7 @@
 # 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
@@ -32,10 +32,11 @@ INCLUDE_DIRECTORIES(
   ${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/OpenGLUtils
+  ${PROJECT_SOURCE_DIR}/src/CAF
 )
 
 # additional preprocessor / compiler flags
@@ -43,8 +44,9 @@ ADD_DEFINITIONS(${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${OGL_DEFINITIONS})
 
 # libraries to link to
 SET(_link_LIBRARIES
-  ${OPENGL_LIBRARIES} ${QT_LIBRARIES} ${CAS_KERNEL} ${CAS_VIEWER}
-  CASCatch qtx suit OpenGLUtils ViewerTools ViewerData
+  ${OPENGL_LIBRARIES} ${QT_LIBRARIES} ${CAS_KERNEL} ${CAS_VIEWER} ${CAS_TKGeomAlgo}
+  ${CAS_TKTopAlgo} ${CAS_TKG2d} ${CAS_TKOpenGl}
+  CASCatch qtx suit ViewerTools ViewerData OpenGLUtils caf
 )
 
 # --- headers ---
@@ -54,6 +56,9 @@ SET(_moc_HEADERS
   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
@@ -66,6 +71,8 @@ SET(_moc_HEADERS
   OCCViewer_ViewPort3d.h
   OCCViewer_ViewSketcher.h
   OCCViewer_ViewWindow.h
+  OCCViewer_ViewportInputFilter.h
+  OCCViewer_ClipPlaneInteractor.h
 )
 
 # header files / no moc processing
@@ -74,6 +81,7 @@ SET(_other_HEADERS
   OCCViewer_ClipPlane.h
   OCCViewer_Trihedron.h 
   OCCViewer_VService.h
+  OCCViewer_Utilities.h
 )
 
 # header files / no moc processing / internal
@@ -87,6 +95,9 @@ SET(OCCViewer_HEADERS ${_moc_HEADERS} ${_other_HEADERS})
 
 # --- resources ---
 
+# resource files / to be processed by rcc
+SET(_rcc_RESOURCES OCCViewer.qrc)
+
 # resource files / to be processed by lrelease
 SET(_ts_RESOURCES
   resources/OCCViewer_images.ts
@@ -108,13 +119,16 @@ SET(_other_RESOURCES
   resources/occ_view_clone.png
   resources/occ_view_fitall.png
   resources/occ_view_fitarea.png
+  resources/occ_view_fitselection.png
   resources/occ_view_front.png
   resources/occ_view_glpan.png
   resources/occ_view_graduated_axes.png
   resources/occ_view_left.png
   resources/occ_view_maximized.png
   resources/occ_view_minimized.png
+  resources/occ_view_orthographic.png
   resources/occ_view_pan.png
+  resources/occ_view_perspective.png
   resources/occ_view_preselection.png
   resources/occ_view_presets.png
   resources/occ_view_reset.png
@@ -125,11 +139,15 @@ SET(_other_RESOURCES
   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 ---
@@ -137,11 +155,17 @@ SET(_other_RESOURCES
 # sources / moc wrappings
 QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
 
+# sources / rcc wrappings
+QT4_ADD_RESOURCES(_rcc_SOURCES ${_rcc_RESOURCES})
+
 # sources / static
 SET(_other_SOURCES
   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
@@ -157,10 +181,13 @@ SET(_other_SOURCES
   OCCViewer_ViewPort3d.cxx
   OCCViewer_ViewSketcher.cxx
   OCCViewer_ViewWindow.cxx
+  OCCViewer_ViewportInputFilter.cxx
+  OCCViewer_ClipPlaneInteractor.cxx
+  OCCViewer_Utilities.cxx
 )
 
 # sources / to compile
-SET(OCCViewer_SOURCES ${_other_SOURCES} ${_moc_SOURCES})
+SET(OCCViewer_SOURCES ${_other_SOURCES} ${_moc_SOURCES} ${_rcc_SOURCES})
 
 # --- rules ---