X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FCMakeLists.txt;h=5ceda79603cc6772b9892f5b90e4443776859be6;hb=bca0d6dc03d998fb8fe24a0003f7b392b403ea11;hp=460458d1ab561bfc9abc421cca0a489eafa594ad;hpb=b96d49472ad23f609343fa158d1d7b96c729ed09;p=modules%2Fshaper.git

diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt
index 460458d1a..5ceda7960 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
@@ -18,7 +16,6 @@ SET(PROJECT_HEADERS
     XGUI_Viewer.h
 	XGUI_RubberBand.h
 	XGUI_Constants.h
-	XGUI_ViewBackground.h
 	XGUI_DocumentDataModel.h
 	XGUI_PartDataModel.h
 	XGUI_ObjectsBrowser.h
@@ -26,6 +23,16 @@ SET(PROJECT_HEADERS
     XGUI_DataTreeModel.h
     XGUI_SelectionMgr.h
     XGUI_SalomeConnector.h
+    XGUI_ActionsMgr.h
+    XGUI_ErrorDialog.h
+    XGUI_ViewerProxy.h
+    XGUI_PropertyPanel.h
+    XGUI_ContextMenuMgr.h
+    XGUI_ModuleConnector.h
+	XGUI_Selection.h
+	XGUI_Preferences.h
+	XGUI_IPrefMgr.h
+	XGUI_QtEvents.h
 )
 
 SET(PROJECT_AUTOMOC 
@@ -45,33 +52,48 @@ SET(PROJECT_SOURCES
     XGUI_ViewPort.cpp
     XGUI_Viewer.cpp
 	XGUI_RubberBand.cpp
-	XGUI_ViewBackground.cpp
 	XGUI_DocumentDataModel.cpp
 	XGUI_PartDataModel.cpp
 	XGUI_ObjectsBrowser.cpp
 	XGUI_OperationMgr.cpp
     XGUI_SelectionMgr.cpp
+    XGUI_ActionsMgr.cpp
+    XGUI_ErrorDialog.cpp
+    XGUI_ViewerProxy.cpp
+    XGUI_PropertyPanel.cpp
+    XGUI_ContextMenuMgr.cpp
+    XGUI_ModuleConnector.cpp
+	XGUI_Selection.cpp
+	XGUI_Preferences.cpp
+	XGUI_QtEvents.cpp
 )
 
 SET(PROJECT_RESOURCES 
     XGUI_pictures.qrc
 )
 
-#SET(TEXT_RESOURCES
-#	XGUI_msg_en.ts
-#)
+SET(PREFERENCES_XML
+	NewGeom.xml
+)
+
+SET(TEXT_RESOURCES
+	XGUI_msg_fr.ts
+)
 
 SET(PROJECT_LIBRARIES
     Events
     Config
+	ModelAPI
+	ModuleBase
 	${QT_LIBRARIES}
 	${CAS_VIEWER}
 	${CAS_KERNEL}
-	PyConsole
-	PyInterp
-	PyEvent
-	ModelAPI
-	ModuleBase
+	${CAS_SHAPE}
+	${PYTHON_LIBRARIES}
+	${PyConsole}
+	${PyInterp}
+	${suit}
+	${qtx}
 )
 
 IF(WIN32) 
@@ -83,20 +105,28 @@ 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})
-SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES} ${PROJECT_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} ${PREFERENCES_XML})
 
 ADD_DEFINITIONS( -DXGUI_EXPORTS ${CAS_DEFINITIONS} )
 
 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
-					 ${CAS_INCLUDE_DIRS})
+					 ${PROJECT_SOURCE_DIR}/src/PartSetPlugin
+					 ${PROJECT_SOURCE_DIR}/src/GeomAlgoAPI
+					 ${CAS_INCLUDE_DIRS}
+					 ${SUIT_INCLUDE})
 
 LINK_DIRECTORIES($ENV{PYTHON_LIB_DIR})
 
@@ -104,6 +134,9 @@ ADD_LIBRARY(XGUI SHARED
 	${PROJECT_SOURCES} 
 	${PROJECT_HEADERS} 
 	${PROJECT_COMPILED_RESOURCES} 
+	${TEXT_RESOURCES}
+	${QM_RESOURCES}
+	${PREFERENCES_XML}
 )
 
 ADD_DEPENDENCIES(XGUI ModelAPI)
@@ -112,4 +145,5 @@ 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)
+INSTALL(FILES ${PREFERENCES_XML} DESTINATION resources)