Merge branch 'master' of newgeom:newgeom

[modules/shaper.git] / src / XGUI / CMakeLists.txt

diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt
index a246e4060ebcd25ac868fb9babc49dabc0fc7bcd..ea9af50b6bfd6138eea9e3575a077cf30d68ead6 100644 (file)
--- a/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@ -19,14 +19,20 @@ SET(PROJECT_HEADERS
        XGUI_RubberBand.h
        XGUI_Constants.h
        XGUI_ViewBackground.h
-       XGUI_WidgetFactory.h
        XGUI_DocumentDataModel.h
        XGUI_PartDataModel.h
        XGUI_ObjectsBrowser.h
        XGUI_OperationMgr.h
     XGUI_DataTreeModel.h
     XGUI_SelectionMgr.h
-    XGUI_SwitchWidget.h
+    XGUI_SalomeConnector.h
+    XGUI_ActionsMgr.h
+    XGUI_ErrorDialog.h
+    XGUI_SalomeViewer.h
+    XGUI_ViewerProxy.h
+    XGUI_ViewerPrs.h
+    XGUI_PropertyPanel.h
+    XGUI_ContextMenuMgr.h
 )
 
 SET(PROJECT_AUTOMOC 
@@ -47,22 +53,26 @@ SET(PROJECT_SOURCES
     XGUI_Viewer.cpp
        XGUI_RubberBand.cpp
        XGUI_ViewBackground.cpp
-       XGUI_WidgetFactory.cpp
        XGUI_DocumentDataModel.cpp
        XGUI_PartDataModel.cpp
        XGUI_ObjectsBrowser.cpp
        XGUI_OperationMgr.cpp
     XGUI_SelectionMgr.cpp
-    XGUI_SwitchWidget.cpp
+    XGUI_ActionsMgr.cpp
+    XGUI_ErrorDialog.cpp
+    XGUI_ViewerProxy.cpp
+    XGUI_ViewerPrs.cpp
+    XGUI_PropertyPanel.cpp
+    XGUI_ContextMenuMgr.cpp
 )
 
 SET(PROJECT_RESOURCES 
     XGUI_pictures.qrc
 )
 
-#SET(TEXT_RESOURCES
-#      XGUI_msg_en.ts
-#)
+SET(TEXT_RESOURCES
+       XGUI_msg_fr.ts
+)
 
 SET(PROJECT_LIBRARIES
     Events
@@ -86,8 +96,15 @@ ENDIF()
 QT4_ADD_RESOURCES(PROJECT_COMPILED_RESOURCES ${PROJECT_RESOURCES})
 #QT5_ADD_TRANSLATION(QM_RESOURCES ${TEXT_RESOURCES})
 
-#SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES} ${QM_RESOURCES})
-SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES})
+QT4_CREATE_TRANSLATION(QM_RESOURCES 
+                                          ${PROJECT_SOURCES}
+                                          ${TEXT_RESOURCES}
+                                          OPTIONS -extensions cpp -no-recursive
+                                          )
+
+
+SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES} ${QM_RESOURCES})
+#SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES})
 SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES} ${PROJECT_RESOURCES})
 
 ADD_DEFINITIONS( -DXGUI_EXPORTS ${CAS_DEFINITIONS} )
@@ -107,6 +124,8 @@ ADD_LIBRARY(XGUI SHARED
        ${PROJECT_SOURCES} 
        ${PROJECT_HEADERS} 
        ${PROJECT_COMPILED_RESOURCES} 
+       ${TEXT_RESOURCES}
+       ${QM_RESOURCES}
 )
 
 ADD_DEPENDENCIES(XGUI ModelAPI)
@@ -115,4 +134,4 @@ ADD_DEPENDENCIES(XGUI ModelAPI)
 TARGET_LINK_LIBRARIES(XGUI ${PROJECT_LIBRARIES})
 
 INSTALL(TARGETS XGUI DESTINATION bin)
-#INSTALL(FILES ${QM_RESOURCES} DESTINATION bin)
+INSTALL(FILES ${QM_RESOURCES} DESTINATION bin)