X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FCMakeLists.txt;h=704b5ea05eba5c0437e012945bed97d60970b880;hb=45fcac308a927f173b4cf7a5c705776be26c687f;hp=450954322a3bb50d4a0cc8dd99a85a1745dd210d;hpb=142e6a7451245b1c39e5d0afbabb5dc4f678520e;p=modules%2Fshaper.git

diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt
index 450954322..704b5ea05 100644
--- a/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@ -1,37 +1,31 @@
+## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 
 SET(CMAKE_AUTOMOC ON)
 
 SET(PROJECT_HEADERS
 	XGUI.h
-	XGUI_Command.h
+	XGUI_ActionsMgr.h
+	XGUI_ColorDialog.h
+	XGUI_ContextMenuMgr.h
+	XGUI_CustomPrs.h
+	XGUI_DataModel.h
 	XGUI_Displayer.h
-	XGUI_MainMenu.h
-	XGUI_MainWindow.h
-	XGUI_MenuGroupPanel.h
-	XGUI_Tools.h
-	XGUI_Workbench.h
-	XGUI_Workshop.h
-    XGUI_ViewWindow.h
-    XGUI_ViewPort.h
-    XGUI_Viewer.h
-	XGUI_RubberBand.h
-	XGUI_Constants.h
-	XGUI_ViewBackground.h
-	XGUI_DocumentDataModel.h
-	XGUI_PartDataModel.h
+	XGUI_ErrorDialog.h
+	XGUI_ErrorMgr.h
+	XGUI_HistoryMenu.h
+	XGUI_ModuleConnector.h
 	XGUI_ObjectsBrowser.h
 	XGUI_OperationMgr.h
-    XGUI_DataTreeModel.h
-    XGUI_SelectionMgr.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
-    XGUI_ModuleConnector.h
+	XGUI_PropertyPanel.h
+	XGUI_QtEvents.h
+	XGUI_SalomeConnector.h
+	XGUI_Selection.h
+	XGUI_SelectionMgr.h
+	XGUI_Tools.h
+	XGUI_ViewerProxy.h
+	XGUI_Workshop.h
+	XGUI_WorkshopListener.h
 )
 
 SET(PROJECT_AUTOMOC 
@@ -39,37 +33,37 @@ SET(PROJECT_AUTOMOC
 )
 
 SET(PROJECT_SOURCES
-	XGUI_Command.cpp
+	XGUI_ActionsMgr.cpp
+	XGUI_ColorDialog.cpp
+	XGUI_ContextMenuMgr.cpp
+	XGUI_CustomPrs.cpp
+	XGUI_DataModel.cpp
 	XGUI_Displayer.cpp
-	XGUI_MainMenu.cpp
-	XGUI_MainWindow.cpp
-	XGUI_MenuGroupPanel.cpp
-	XGUI_Tools.cpp
-	XGUI_Workbench.cpp
-	XGUI_Workshop.cpp
-    XGUI_ViewWindow.cpp
-    XGUI_ViewPort.cpp
-    XGUI_Viewer.cpp
-	XGUI_RubberBand.cpp
-	XGUI_ViewBackground.cpp
-	XGUI_DocumentDataModel.cpp
-	XGUI_PartDataModel.cpp
+	XGUI_ErrorDialog.cpp
+	XGUI_ErrorMgr.cpp
+	XGUI_HistoryMenu.cpp
+	XGUI_ModuleConnector.cpp
 	XGUI_ObjectsBrowser.cpp
 	XGUI_OperationMgr.cpp
-    XGUI_SelectionMgr.cpp
-    XGUI_ActionsMgr.cpp
-    XGUI_ErrorDialog.cpp
-    XGUI_ViewerProxy.cpp
-    XGUI_ViewerPrs.cpp
-    XGUI_PropertyPanel.cpp
-    XGUI_ContextMenuMgr.cpp
-    XGUI_ModuleConnector.cpp
+	XGUI_PropertyPanel.cpp
+	XGUI_QtEvents.cpp
+	XGUI_SalomeConnector.cpp
+	XGUI_Selection.cpp
+	XGUI_SelectionMgr.cpp
+	XGUI_Tools.cpp
+	XGUI_ViewerProxy.cpp
+	XGUI_Workshop.cpp
+	XGUI_WorkshopListener.cpp
 )
 
 SET(PROJECT_RESOURCES 
     XGUI_pictures.qrc
 )
 
+SET(PREFERENCES_XML
+	NewGeom.xml
+)
+
 SET(TEXT_RESOURCES
 	XGUI_msg_fr.ts
 )
@@ -77,14 +71,18 @@ SET(TEXT_RESOURCES
 SET(PROJECT_LIBRARIES
     Events
     Config
+	ModelAPI
+	ModuleBase
+	AppElements
 	${QT_LIBRARIES}
 	${CAS_VIEWER}
 	${CAS_KERNEL}
-	PyConsole
-	PyInterp
-	PyEvent
-	ModelAPI
-	ModuleBase
+	${CAS_SHAPE}
+	${PYTHON_LIBRARIES}
+	${PyConsole}
+	${PyInterp}
+	${suit}
+	${qtx}
 )
 
 IF(WIN32) 
@@ -105,20 +103,20 @@ QT4_CREATE_TRANSLATION(QM_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})
+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/GeomAPI
-				     ${PROJECT_SOURCE_DIR}/src/Model
 					 ${PROJECT_SOURCE_DIR}/src/ModuleBase
-					 ${PROJECT_SOURCE_DIR}/src/PartSetPlugin
-					 ${CAS_INCLUDE_DIRS})
+#					 ${PROJECT_SOURCE_DIR}/src/PartSetPlugin
+					 ${PROJECT_SOURCE_DIR}/src/GeomAlgoAPI
+					 ${PROJECT_SOURCE_DIR}/src/AppElements
+					 ${CAS_INCLUDE_DIRS}
+					 ${SUIT_INCLUDE})
 
 LINK_DIRECTORIES($ENV{PYTHON_LIB_DIR})
 
@@ -128,6 +126,7 @@ ADD_LIBRARY(XGUI SHARED
 	${PROJECT_COMPILED_RESOURCES} 
 	${TEXT_RESOURCES}
 	${QM_RESOURCES}
+	${PREFERENCES_XML}
 )
 
 ADD_DEPENDENCIES(XGUI ModelAPI)
@@ -137,3 +136,4 @@ TARGET_LINK_LIBRARIES(XGUI ${PROJECT_LIBRARIES})
 
 INSTALL(TARGETS XGUI DESTINATION bin)
 INSTALL(FILES ${QM_RESOURCES} DESTINATION bin)
+INSTALL(FILES ${PREFERENCES_XML} DESTINATION resources)