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
INT PAL 0052660: Plot2D Viewer: Plot2d_Curve can't be selected
[modules/gui.git]
/
src
/
OCCViewer
/
CMakeLists.txt
diff --git
a/src/OCCViewer/CMakeLists.txt
b/src/OCCViewer/CMakeLists.txt
index 89f863207ee318c4f58bff7b7bd427618d1797e4..eefdd3f503f7d6d9127130344fd87cf2552884a1 100755
(executable)
--- a/
src/OCCViewer/CMakeLists.txt
+++ b/
src/OCCViewer/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-201
5
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
@@
-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
# 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
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-29,11
+29,12
@@
INCLUDE_DIRECTORIES(
${CAS_INCLUDE_DIRS}
${OGL_INCLUDE_DIRS}
${QT_INCLUDES}
${CAS_INCLUDE_DIRS}
${OGL_INCLUDE_DIRS}
${QT_INCLUDES}
- ${
KERNEL_INCLUDE_DIRS
}
+ ${
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/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/ViewerTools
)
@@
-42,8
+43,9
@@
ADD_DEFINITIONS(${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${OGL_DEFINITIONS})
# libraries to link to
SET(_link_LIBRARIES
# libraries to link to
SET(_link_LIBRARIES
- ${OPENGL_LIBRARIES} ${QT_LIBRARIES} ${CAS_KERNEL} ${CAS_VIEWER}
- CASCatch qtx suit OpenGLUtils ViewerTools
+ ${OPENGL_LIBRARIES} ${QT_LIBRARIES} ${CAS_KERNEL} ${CAS_VIEWER} ${CAS_TKGeomAlgo}
+ ${CAS_TKTopAlgo} ${CAS_TKG2d} ${CAS_TKOpenGl}
+ CASCatch qtx suit OpenGLUtils ViewerTools ViewerData
)
# --- headers ---
)
# --- headers ---
@@
-65,13
+67,17
@@
SET(_moc_HEADERS
OCCViewer_ViewPort3d.h
OCCViewer_ViewSketcher.h
OCCViewer_ViewWindow.h
OCCViewer_ViewPort3d.h
OCCViewer_ViewSketcher.h
OCCViewer_ViewWindow.h
+ OCCViewer_ViewportInputFilter.h
+ OCCViewer_ClipPlaneInteractor.h
)
# header files / no moc processing
SET(_other_HEADERS
OCCViewer.h
)
# header files / no moc processing
SET(_other_HEADERS
OCCViewer.h
+ OCCViewer_ClipPlane.h
OCCViewer_Trihedron.h
OCCViewer_VService.h
OCCViewer_Trihedron.h
OCCViewer_VService.h
+ OCCViewer_Utilities.h
)
# header files / no moc processing / internal
)
# header files / no moc processing / internal
@@
-85,6
+91,9
@@
SET(OCCViewer_HEADERS ${_moc_HEADERS} ${_other_HEADERS})
# --- resources ---
# --- 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
# resource files / to be processed by lrelease
SET(_ts_RESOURCES
resources/OCCViewer_images.ts
@@
-116,6
+125,7
@@
SET(_other_RESOURCES
resources/occ_view_preselection.png
resources/occ_view_presets.png
resources/occ_view_reset.png
resources/occ_view_preselection.png
resources/occ_view_presets.png
resources/occ_view_reset.png
+ resources/occ_view_return_3d_view.png
resources/occ_view_right.png
resources/occ_view_rotate.png
resources/occ_view_rotation_point.png
resources/occ_view_right.png
resources/occ_view_rotate.png
resources/occ_view_rotation_point.png
@@
-134,11
+144,15
@@
SET(_other_RESOURCES
# sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
# 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
# sources / static
SET(_other_SOURCES
OCCViewer_AISSelector.cxx
OCCViewer_AxialScaleDlg.cxx
OCCViewer_ClippingDlg.cxx
+ OCCViewer_ClipPlane.cxx
OCCViewer_CreateRestoreViewDlg.cxx
OCCViewer_CubeAxesDlg.cxx
OCCViewer_FontWidget.cxx
OCCViewer_CreateRestoreViewDlg.cxx
OCCViewer_CubeAxesDlg.cxx
OCCViewer_FontWidget.cxx
@@
-153,10
+167,13
@@
SET(_other_SOURCES
OCCViewer_ViewPort3d.cxx
OCCViewer_ViewSketcher.cxx
OCCViewer_ViewWindow.cxx
OCCViewer_ViewPort3d.cxx
OCCViewer_ViewSketcher.cxx
OCCViewer_ViewWindow.cxx
+ OCCViewer_ViewportInputFilter.cxx
+ OCCViewer_ClipPlaneInteractor.cxx
+ OCCViewer_Utilities.cxx
)
# sources / to compile
)
# sources / to compile
-SET(OCCViewer_SOURCES ${_other_SOURCES} ${_moc_SOURCES})
+SET(OCCViewer_SOURCES ${_other_SOURCES} ${_moc_SOURCES}
${_rcc_SOURCES}
)
# --- rules ---
# --- rules ---