X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FCMakeLists.txt;h=56f7bebd6fd2e5aab5007b7d590399e309ba701d;hb=ca05954b3f9fe2c1a21333df5d454eeccbd42224;hp=34fe79010c0933d35f158b01e4978a12605934b4;hpb=0783fed48f75aa8b7d85fb426ebe3ca61139fdc9;p=modules%2Fshaper.git

diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt
index 34fe79010..56f7bebd6 100644
--- a/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@ -1,39 +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_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_PropertyPanel.h
-    XGUI_ContextMenuMgr.h
-    XGUI_ModuleConnector.h
-	XGUI_Selection.h
-	XGUI_Preferences.h
-	XGUI_IPrefMgr.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 
@@ -41,32 +33,27 @@ 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_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_PropertyPanel.cpp
-    XGUI_ContextMenuMgr.cpp
-    XGUI_ModuleConnector.cpp
-	XGUI_Selection.cpp
-	XGUI_Preferences.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 
@@ -89,6 +76,7 @@ SET(PROJECT_LIBRARIES
 	${QT_LIBRARIES}
 	${CAS_VIEWER}
 	${CAS_KERNEL}
+	${CAS_SHAPE}
 	${PYTHON_LIBRARIES}
 	${PyConsole}
 	${PyInterp}
@@ -96,6 +84,11 @@ SET(PROJECT_LIBRARIES
 	${qtx}
 )
 
+IF(NOT ${HAVE_SALOME})
+    SET(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} AppElements)
+ENDIF(NOT ${HAVE_SALOME})
+
+
 IF(WIN32) 
     SET(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} opengl32)
 ELSE()
@@ -118,15 +111,22 @@ SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES} ${PROJECT_RESOURCES} ${PR
 
 ADD_DEFINITIONS( -DXGUI_EXPORTS ${CAS_DEFINITIONS} )
 
-INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/src/Events
-					 ${PROJECT_SOURCE_DIR}/src/Config
-					 ${PROJECT_SOURCE_DIR}/src/ModelAPI
-					 ${PROJECT_SOURCE_DIR}/src/GeomAPI
-					 ${PROJECT_SOURCE_DIR}/src/ModuleBase
-					 ${PROJECT_SOURCE_DIR}/src/PartSetPlugin
-					 ${CAS_INCLUDE_DIRS}
-					 ${SUIT_INCLUDE})
-
+SET(PROJECT_INCLUDES 
+    ${PROJECT_SOURCE_DIR}/src/Events
+    ${PROJECT_SOURCE_DIR}/src/Config
+    ${PROJECT_SOURCE_DIR}/src/ModelAPI
+    ${PROJECT_SOURCE_DIR}/src/GeomAPI
+    ${PROJECT_SOURCE_DIR}/src/ModuleBase
+    ${PROJECT_SOURCE_DIR}/src/GeomAlgoAPI
+    ${CAS_INCLUDE_DIRS}
+    ${SUIT_INCLUDE})
+
+IF(NOT ${HAVE_SALOME})
+    SET(PROJECT_INCLUDES ${PROJECT_INCLUDES} ${PROJECT_SOURCE_DIR}/src/AppElements)
+ENDIF(NOT ${HAVE_SALOME})
+
+INCLUDE_DIRECTORIES(${PROJECT_INCLUDES})
+                         
 LINK_DIRECTORIES($ENV{PYTHON_LIB_DIR})
 
 ADD_LIBRARY(XGUI SHARED