X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FCMakeLists.txt;h=8c9244e52392af267ea209b8dbd0fb887c13ce12;hb=e6aea428c7da7751e753eac36b99e16b7e3166e4;hp=713f9b9051c88c731b4c2e11939b3de5963ae311;hpb=401394b2e312e5c4ecd6a410b90eb2c159a675bf;p=modules%2Fshaper.git

diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt
index 713f9b905..8c9244e52 100644
--- a/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@ -1,14 +1,14 @@
-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,10 +18,21 @@ SET(PROJECT_HEADERS
 	XGUI_RubberBand.h
 	XGUI_Constants.h
 	XGUI_ViewBackground.h
-	XGUI_WidgetFactory.h
 	XGUI_DocumentDataModel.h
-	XGUI_DataModel.h
+	XGUI_PartDataModel.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
 )
 
 SET(PROJECT_AUTOMOC 
@@ -30,7 +41,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
@@ -42,56 +53,82 @@ SET(PROJECT_SOURCES
     XGUI_Viewer.cpp
 	XGUI_RubberBand.cpp
 	XGUI_ViewBackground.cpp
-	XGUI_WidgetFactory.cpp
 	XGUI_DocumentDataModel.cpp
-	XGUI_DataModel.cpp
+	XGUI_PartDataModel.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
 )
 
 SET(PROJECT_RESOURCES 
     XGUI_pictures.qrc
 )
 
-#SET(TEXT_RESOURCES
-#	XGUI_msg_en.ts
-#)
+SET(TEXT_RESOURCES
+	XGUI_msg_fr.ts
+)
 
 SET(PROJECT_LIBRARIES
-	opengl32
-    Event
+    Events
     Config
-	${Qt5Widgets_LIBRARIES}
+	${QT_LIBRARIES}
 	${CAS_VIEWER}
 	${CAS_KERNEL}
 	PyConsole
 	PyInterp
 	PyEvent
 	ModelAPI
+	ModuleBase
 )
 
-QT5_ADD_RESOURCES(PROJECT_COMPILED_RESOURCES ${PROJECT_RESOURCES})
+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})
 
-#SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES} ${QM_RESOURCES})
-SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES})
+QT4_CREATE_TRANSLATION(QM_RESOURCES 
+					   ${PROJECT_SOURCES}
+					   ${TEXT_RESOURCES}
+					   OPTIONS -extensions cpp -no-recursive
+					   )
+
+
+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})
 
-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
 					 ${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})
 
 LINK_DIRECTORIES($ENV{PYTHON_LIB_DIR})
 
-ADD_EXECUTABLE(XGUI WIN32 
+ADD_LIBRARY(XGUI SHARED 
 	${PROJECT_SOURCES} 
 	${PROJECT_HEADERS} 
 	${PROJECT_COMPILED_RESOURCES} 
-	${TEXT_RESOURCES} 
+	${TEXT_RESOURCES}
+	${QM_RESOURCES}
 )
 
 ADD_DEPENDENCIES(XGUI ModelAPI)
@@ -100,4 +137,4 @@ ADD_DEPENDENCIES(XGUI ModelAPI)
 TARGET_LINK_LIBRARIES(XGUI ${PROJECT_LIBRARIES})
 
 INSTALL(TARGETS XGUI DESTINATION bin)
-#INSTALL(FILES ${QM_RESOURCES} DESTINATION bin)
+INSTALL(FILES ${QM_RESOURCES} DESTINATION bin)