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

diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt
index 989980d3b..56f7bebd6 100644
--- a/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@ -1,32 +1,31 @@
-INCLUDE(FindCAS)
+## 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_Module.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_ViewBackground.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_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 
@@ -34,48 +33,62 @@ 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_ViewBackground.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_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 
     XGUI_pictures.qrc
 )
 
-#SET(TEXT_RESOURCES
-#	XGUI_msg_en.ts
-#)
+SET(PREFERENCES_XML
+	NewGeom.xml
+)
+
+SET(TEXT_RESOURCES
+	XGUI_msg_fr.ts
+)
 
 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(NOT ${HAVE_SALOME})
+    SET(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} AppElements)
+ENDIF(NOT ${HAVE_SALOME})
+
+
 IF(WIN32) 
     SET(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} opengl32)
 ELSE()
@@ -85,27 +98,44 @@ 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})
-SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES} ${PROJECT_RESOURCES})
+QT4_CREATE_TRANSLATION(QM_RESOURCES 
+					   ${PROJECT_SOURCES}
+					   ${TEXT_RESOURCES}
+					   OPTIONS -extensions cpp -no-recursive
+					   )
 
-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/ModuleBase
-					 ${CAS_INCLUDE_DIRS})
+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} ${PREFERENCES_XML})
+
+ADD_DEFINITIONS( -DXGUI_EXPORTS ${CAS_DEFINITIONS} )
 
+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 
 	${PROJECT_SOURCES} 
 	${PROJECT_HEADERS} 
 	${PROJECT_COMPILED_RESOURCES} 
+	${TEXT_RESOURCES}
+	${QM_RESOURCES}
+	${PREFERENCES_XML}
 )
 
 ADD_DEPENDENCIES(XGUI ModelAPI)
@@ -114,4 +144,5 @@ 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)
+INSTALL(FILES ${PREFERENCES_XML} DESTINATION resources)