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

diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt
index ea9af50b6..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
@@ -28,11 +25,14 @@ SET(PROJECT_HEADERS
     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_Selection.h
+	XGUI_Preferences.h
+	XGUI_IPrefMgr.h
+	XGUI_QtEvents.h
 )
 
 SET(PROJECT_AUTOMOC 
@@ -52,7 +52,6 @@ SET(PROJECT_SOURCES
     XGUI_ViewPort.cpp
     XGUI_Viewer.cpp
 	XGUI_RubberBand.cpp
-	XGUI_ViewBackground.cpp
 	XGUI_DocumentDataModel.cpp
 	XGUI_PartDataModel.cpp
 	XGUI_ObjectsBrowser.cpp
@@ -61,15 +60,22 @@ SET(PROJECT_SOURCES
     XGUI_ActionsMgr.cpp
     XGUI_ErrorDialog.cpp
     XGUI_ViewerProxy.cpp
-    XGUI_ViewerPrs.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(PREFERENCES_XML
+	NewGeom.xml
+)
+
 SET(TEXT_RESOURCES
 	XGUI_msg_fr.ts
 )
@@ -77,14 +83,17 @@ SET(TEXT_RESOURCES
 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) 
@@ -105,18 +114,19 @@ 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/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})
 
@@ -126,6 +136,7 @@ ADD_LIBRARY(XGUI SHARED
 	${PROJECT_COMPILED_RESOURCES} 
 	${TEXT_RESOURCES}
 	${QM_RESOURCES}
+	${PREFERENCES_XML}
 )
 
 ADD_DEPENDENCIES(XGUI ModelAPI)
@@ -135,3 +146,4 @@ TARGET_LINK_LIBRARIES(XGUI ${PROJECT_LIBRARIES})
 
 INSTALL(TARGETS XGUI DESTINATION bin)
 INSTALL(FILES ${QM_RESOURCES} DESTINATION bin)
+INSTALL(FILES ${PREFERENCES_XML} DESTINATION resources)