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 de1434512b49f4ef916ac6fd542115c0e5747c71..eefdd3f503f7d6d9127130344fd87cf2552884a1 100755
(executable)
--- a/
src/OCCViewer/CMakeLists.txt
+++ b/
src/OCCViewer/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2007-201
4
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
@@
-44,7
+44,7
@@
ADD_DEFINITIONS(${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${OGL_DEFINITIONS})
# libraries to link to
SET(_link_LIBRARIES
${OPENGL_LIBRARIES} ${QT_LIBRARIES} ${CAS_KERNEL} ${CAS_VIEWER} ${CAS_TKGeomAlgo}
# libraries to link to
SET(_link_LIBRARIES
${OPENGL_LIBRARIES} ${QT_LIBRARIES} ${CAS_KERNEL} ${CAS_VIEWER} ${CAS_TKGeomAlgo}
- ${CAS_TKTopAlgo} ${CAS_TKG2d}
+ ${CAS_TKTopAlgo} ${CAS_TKG2d}
${CAS_TKOpenGl}
CASCatch qtx suit OpenGLUtils ViewerTools ViewerData
)
CASCatch qtx suit OpenGLUtils ViewerTools ViewerData
)
@@
-77,6
+77,7
@@
SET(_other_HEADERS
OCCViewer_ClipPlane.h
OCCViewer_Trihedron.h
OCCViewer_VService.h
OCCViewer_ClipPlane.h
OCCViewer_Trihedron.h
OCCViewer_VService.h
+ OCCViewer_Utilities.h
)
# header files / no moc processing / internal
)
# header files / no moc processing / internal
@@
-90,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
@@
-140,6
+144,9
@@
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
# sources / static
SET(_other_SOURCES
OCCViewer_AISSelector.cxx
@@
-162,10
+169,11
@@
SET(_other_SOURCES
OCCViewer_ViewWindow.cxx
OCCViewer_ViewportInputFilter.cxx
OCCViewer_ClipPlaneInteractor.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 ---