X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FCMakeLists.txt;h=67ba7629dcd28365ffb75f99e84791f2d7db21b2;hb=fed43d1e0bbd617580196c6038bb02206529f359;hp=becc47ee3f97d01ea89c62a6c75d3b4dd48c5280;hpb=c80e8ac643930b858f4f653e2659896ba587b165;p=modules%2Fshaper.git

diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt
index becc47ee3..67ba7629d 100644
--- a/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@ -1,4 +1,3 @@
-INCLUDE(FindCAS)
 
 SET(CMAKE_AUTOMOC ON)
 
@@ -9,7 +8,6 @@ SET(PROJECT_HEADERS
 	XGUI_MainMenu.h
 	XGUI_MainWindow.h
 	XGUI_MenuGroupPanel.h
-	XGUI_Module.h
 	XGUI_Tools.h
 	XGUI_Workbench.h
 	XGUI_Workshop.h
@@ -19,14 +17,21 @@ 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_PropertyPanel.h
+    XGUI_ContextMenuMgr.h
+    XGUI_ModuleConnector.h
+	XGUI_Selection.h
 )
 
 SET(PROJECT_AUTOMOC 
@@ -47,25 +52,30 @@ 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_PropertyPanel.cpp
+    XGUI_ContextMenuMgr.cpp
+    XGUI_ModuleConnector.cpp
+	XGUI_Selection.cpp
 )
 
 SET(PROJECT_RESOURCES 
     XGUI_pictures.qrc
 )
 
-#SET(TEXT_RESOURCES
-#	XGUI_msg_en.ts
-#)
+SET(TEXT_RESOURCES
+	XGUI_msg_fr.ts
+)
 
 SET(PROJECT_LIBRARIES
-    Event
+    Events
     Config
 	${QT_LIBRARIES}
 	${CAS_VIEWER}
@@ -86,19 +96,27 @@ 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} )
 
-INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/src/Event
+INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/src/Events
 					 ${PROJECT_SOURCE_DIR}/src/Config
 					 ${PROJECT_SOURCE_DIR}/src/PyInterp
 					 ${PROJECT_SOURCE_DIR}/src/PyConsole
 					 ${PROJECT_SOURCE_DIR}/src/ModelAPI
-					 ${PROJECT_SOURCE_DIR}/src/Model
+					 ${PROJECT_SOURCE_DIR}/src/GeomAPI
 					 ${PROJECT_SOURCE_DIR}/src/ModuleBase
+					 ${PROJECT_SOURCE_DIR}/src/PartSetPlugin
 					 ${CAS_INCLUDE_DIRS})
 
 LINK_DIRECTORIES($ENV{PYTHON_LIB_DIR})
@@ -107,6 +125,8 @@ ADD_LIBRARY(XGUI SHARED
 	${PROJECT_SOURCES} 
 	${PROJECT_HEADERS} 
 	${PROJECT_COMPILED_RESOURCES} 
+	${TEXT_RESOURCES}
+	${QM_RESOURCES}
 )
 
 ADD_DEPENDENCIES(XGUI ModelAPI)
@@ -115,4 +135,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)