X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FCMakeLists.txt;h=989980d3b6703be775e7e581dceab9942f963da5;hb=d80699ac131d75798c6c39deff2c5e820aface5f;hp=f428942ff1f5c490b024f3bcf2723a8ac60e8cca;hpb=1fc8dc0984e6bb92df544300fda9aa625ad5c05e;p=modules%2Fshaper.git

diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt
index f428942ff..989980d3b 100644
--- a/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@ -1,14 +1,15 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
-
 INCLUDE(FindCAS)
 
 SET(CMAKE_AUTOMOC ON)
 
 SET(PROJECT_HEADERS
+	XGUI.h
 	XGUI_Command.h
+	XGUI_Displayer.h
 	XGUI_MainMenu.h
 	XGUI_MainWindow.h
 	XGUI_MenuGroupPanel.h
+	XGUI_Module.h
 	XGUI_Tools.h
 	XGUI_Workbench.h
 	XGUI_Workshop.h
@@ -18,12 +19,14 @@ SET(PROJECT_HEADERS
 	XGUI_RubberBand.h
 	XGUI_Constants.h
 	XGUI_ViewBackground.h
-	XGUI_WidgetFactory.h
 	XGUI_DocumentDataModel.h
 	XGUI_PartDataModel.h
 	XGUI_ObjectsBrowser.h
+	XGUI_OperationMgr.h
     XGUI_DataTreeModel.h
     XGUI_SelectionMgr.h
+    XGUI_SalomeConnector.h
+    XGUI_ActionsMgr.h
 )
 
 SET(PROJECT_AUTOMOC 
@@ -32,7 +35,7 @@ SET(PROJECT_AUTOMOC
 
 SET(PROJECT_SOURCES
 	XGUI_Command.cpp
-	XGUI_Main.cpp
+	XGUI_Displayer.cpp
 	XGUI_MainMenu.cpp
 	XGUI_MainWindow.cpp
 	XGUI_MenuGroupPanel.cpp
@@ -44,11 +47,12 @@ SET(PROJECT_SOURCES
     XGUI_Viewer.cpp
 	XGUI_RubberBand.cpp
 	XGUI_ViewBackground.cpp
-	XGUI_WidgetFactory.cpp
 	XGUI_DocumentDataModel.cpp
 	XGUI_PartDataModel.cpp
 	XGUI_ObjectsBrowser.cpp
+	XGUI_OperationMgr.cpp
     XGUI_SelectionMgr.cpp
+    XGUI_ActionsMgr.cpp
 )
 
 SET(PROJECT_RESOURCES 
@@ -60,11 +64,9 @@ SET(PROJECT_RESOURCES
 #)
 
 SET(PROJECT_LIBRARIES
-	opengl32
-    Event
+    Events
     Config
 	${QT_LIBRARIES}
-	${QT_QTMAIN_LIBRARY}
 	${CAS_VIEWER}
 	${CAS_KERNEL}
 	PyConsole
@@ -74,6 +76,12 @@ SET(PROJECT_LIBRARIES
 	ModuleBase
 )
 
+IF(WIN32) 
+    SET(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} opengl32)
+ELSE()
+    SET(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} GL)
+ENDIF()
+
 QT4_ADD_RESOURCES(PROJECT_COMPILED_RESOURCES ${PROJECT_RESOURCES})
 #QT5_ADD_TRANSLATION(QM_RESOURCES ${TEXT_RESOURCES})
 
@@ -81,9 +89,9 @@ QT4_ADD_RESOURCES(PROJECT_COMPILED_RESOURCES ${PROJECT_RESOURCES})
 SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES})
 SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES} ${PROJECT_RESOURCES})
 
-ADD_DEFINITIONS(${CAS_DEFINITIONS} )
+ADD_DEFINITIONS( -DXGUI_EXPORTS ${CAS_DEFINITIONS} )
 
-INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/src/Event
+INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/src/Events
 					 ${PROJECT_SOURCE_DIR}/src/Config
 					 ${PROJECT_SOURCE_DIR}/src/PyInterp
 					 ${PROJECT_SOURCE_DIR}/src/PyConsole
@@ -94,7 +102,7 @@ INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/src/Event
 
 LINK_DIRECTORIES($ENV{PYTHON_LIB_DIR})
 
-ADD_EXECUTABLE(XGUI WIN32 
+ADD_LIBRARY(XGUI SHARED 
 	${PROJECT_SOURCES} 
 	${PROJECT_HEADERS} 
 	${PROJECT_COMPILED_RESOURCES}