X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FOCCViewer%2FCMakeLists.txt;h=eefdd3f503f7d6d9127130344fd87cf2552884a1;hb=e6caa123c65e3c4a3017364ec5bb4225fd898465;hp=a7cc4289c97b762e21f19a14615f9c0e5d21ab25;hpb=02dbb1360d4508bbc1e53caa473dd72fb4cfb8ec;p=modules%2Fgui.git diff --git a/src/OCCViewer/CMakeLists.txt b/src/OCCViewer/CMakeLists.txt index a7cc4289c..eefdd3f50 100755 --- a/src/OCCViewer/CMakeLists.txt +++ b/src/OCCViewer/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2014 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 @@ -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} - ${CAS_TKTopAlgo} ${CAS_TKG2d} + ${CAS_TKTopAlgo} ${CAS_TKG2d} ${CAS_TKOpenGl} CASCatch qtx suit OpenGLUtils ViewerTools ViewerData ) @@ -76,8 +76,8 @@ SET(_other_HEADERS OCCViewer.h OCCViewer_ClipPlane.h OCCViewer_Trihedron.h - OCCViewer_Utilities.h OCCViewer_VService.h + OCCViewer_Utilities.h ) # header files / no moc processing / internal @@ -91,6 +91,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 @@ -141,6 +144,9 @@ 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 @@ -153,7 +159,6 @@ SET(_other_SOURCES OCCViewer_SetRotationPointDlg.cxx OCCViewer_ToolTip.cxx OCCViewer_Trihedron.cxx - OCCViewer_Utilities.cxx OCCViewer_VService.cxx OCCViewer_ViewFrame.cxx OCCViewer_ViewManager.cxx @@ -164,10 +169,11 @@ SET(_other_SOURCES 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 ---