X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FCMakeLists.txt;h=56f7bebd6fd2e5aab5007b7d590399e309ba701d;hb=95eee6723538599e290922329bb5b2653ebaab20;hp=bd843caa93b19576aab7c2eca61099108cc77a7c;hpb=247fc0bd6c6e04ce1f7a6e67f8d3c80ce17acab0;p=modules%2Fshaper.git

diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt
index bd843caa9..56f7bebd6 100644
--- a/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@ -6,16 +6,17 @@ SET(CMAKE_AUTOMOC ON)
 SET(PROJECT_HEADERS
 	XGUI.h
 	XGUI_ActionsMgr.h
+	XGUI_ColorDialog.h
 	XGUI_ContextMenuMgr.h
 	XGUI_CustomPrs.h
-	XGUI_DataTreeModel.h
+	XGUI_DataModel.h
 	XGUI_Displayer.h
-	XGUI_DocumentDataModel.h
 	XGUI_ErrorDialog.h
+	XGUI_ErrorMgr.h
+	XGUI_HistoryMenu.h
 	XGUI_ModuleConnector.h
 	XGUI_ObjectsBrowser.h
 	XGUI_OperationMgr.h
-	XGUI_PartDataModel.h
 	XGUI_PropertyPanel.h
 	XGUI_QtEvents.h
 	XGUI_SalomeConnector.h
@@ -24,7 +25,7 @@ SET(PROJECT_HEADERS
 	XGUI_Tools.h
 	XGUI_ViewerProxy.h
 	XGUI_Workshop.h
-	XGUI_HistoryMenu.h
+	XGUI_WorkshopListener.h
 )
 
 SET(PROJECT_AUTOMOC 
@@ -33,23 +34,26 @@ SET(PROJECT_AUTOMOC
 
 SET(PROJECT_SOURCES
 	XGUI_ActionsMgr.cpp
+	XGUI_ColorDialog.cpp
 	XGUI_ContextMenuMgr.cpp
 	XGUI_CustomPrs.cpp
+	XGUI_DataModel.cpp
 	XGUI_Displayer.cpp
-	XGUI_DocumentDataModel.cpp
 	XGUI_ErrorDialog.cpp
+	XGUI_ErrorMgr.cpp
+	XGUI_HistoryMenu.cpp
 	XGUI_ModuleConnector.cpp
 	XGUI_ObjectsBrowser.cpp
 	XGUI_OperationMgr.cpp
-	XGUI_PartDataModel.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_HistoryMenu.cpp
+	XGUI_WorkshopListener.cpp
 )
 
 SET(PROJECT_RESOURCES 
@@ -69,7 +73,6 @@ SET(PROJECT_LIBRARIES
     Config
 	ModelAPI
 	ModuleBase
-	AppElements
 	${QT_LIBRARIES}
 	${CAS_VIEWER}
 	${CAS_KERNEL}
@@ -81,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()
@@ -103,17 +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
-					 ${PROJECT_SOURCE_DIR}/src/GeomAlgoAPI
-					 ${PROJECT_SOURCE_DIR}/src/AppElements
-					 ${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