Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'vsr/make_test' into Dev_1.5.0
[modules/shaper.git]
/
src
/
XGUI
/
CMakeLists.txt
diff --git
a/src/XGUI/CMakeLists.txt
b/src/XGUI/CMakeLists.txt
index eca046d10873a0841c3b6ada09da6d91085059ac..704b5ea05eba5c0437e012945bed97d60970b880 100644
(file)
--- a/
src/XGUI/CMakeLists.txt
+++ b/
src/XGUI/CMakeLists.txt
@@
-1,37
+1,31
@@
+## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
SET(CMAKE_AUTOMOC ON)
SET(PROJECT_HEADERS
XGUI.h
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_Displayer.h
- XGUI_MainMenu.h
- XGUI_MainWindow.h
- XGUI_MenuGroupPanel.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_DocumentDataModel.h
- XGUI_PartDataModel.h
+ XGUI_ErrorDialog.h
+ XGUI_ErrorMgr.h
+ XGUI_HistoryMenu.h
+ XGUI_ModuleConnector.h
XGUI_ObjectsBrowser.h
XGUI_OperationMgr.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_PropertyPanel.h
- XGUI_ContextMenuMgr.h
- XGUI_ModuleConnector.h
+ XGUI_PropertyPanel.h
+ XGUI_QtEvents.h
+ XGUI_SalomeConnector.h
XGUI_Selection.h
XGUI_Selection.h
- XGUI_Preferences.h
+ XGUI_SelectionMgr.h
+ XGUI_Tools.h
+ XGUI_ViewerProxy.h
+ XGUI_Workshop.h
+ XGUI_WorkshopListener.h
)
SET(PROJECT_AUTOMOC
)
SET(PROJECT_AUTOMOC
@@
-39,31
+33,27
@@
SET(PROJECT_AUTOMOC
)
SET(PROJECT_SOURCES
)
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_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_DocumentDataModel.cpp
- XGUI_PartDataModel.cpp
+ XGUI_ErrorDialog.cpp
+ XGUI_ErrorMgr.cpp
+ XGUI_HistoryMenu.cpp
+ XGUI_ModuleConnector.cpp
XGUI_ObjectsBrowser.cpp
XGUI_OperationMgr.cpp
XGUI_ObjectsBrowser.cpp
XGUI_OperationMgr.cpp
- XGUI_SelectionMgr.cpp
- XGUI_ActionsMgr.cpp
- XGUI_ErrorDialog.cpp
- XGUI_ViewerProxy.cpp
- XGUI_PropertyPanel.cpp
- XGUI_ContextMenuMgr.cpp
- XGUI_ModuleConnector.cpp
+ XGUI_PropertyPanel.cpp
+ XGUI_QtEvents.cpp
+ XGUI_SalomeConnector.cpp
XGUI_Selection.cpp
XGUI_Selection.cpp
- XGUI_Preferences.cpp
+ XGUI_SelectionMgr.cpp
+ XGUI_Tools.cpp
+ XGUI_ViewerProxy.cpp
+ XGUI_Workshop.cpp
+ XGUI_WorkshopListener.cpp
)
SET(PROJECT_RESOURCES
)
SET(PROJECT_RESOURCES
@@
-81,15
+71,18
@@
SET(TEXT_RESOURCES
SET(PROJECT_LIBRARIES
Events
Config
SET(PROJECT_LIBRARIES
Events
Config
+ ModelAPI
+ ModuleBase
+ AppElements
${QT_LIBRARIES}
${CAS_VIEWER}
${CAS_KERNEL}
${QT_LIBRARIES}
${CAS_VIEWER}
${CAS_KERNEL}
+ ${CAS_SHAPE}
+ ${PYTHON_LIBRARIES}
${PyConsole}
${PyInterp}
${suit}
${qtx}
${PyConsole}
${PyInterp}
${suit}
${qtx}
- ModelAPI
- ModuleBase
)
IF(WIN32)
)
IF(WIN32)
@@
-119,7
+112,9
@@
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/src/Events
${PROJECT_SOURCE_DIR}/src/ModelAPI
${PROJECT_SOURCE_DIR}/src/GeomAPI
${PROJECT_SOURCE_DIR}/src/ModuleBase
${PROJECT_SOURCE_DIR}/src/ModelAPI
${PROJECT_SOURCE_DIR}/src/GeomAPI
${PROJECT_SOURCE_DIR}/src/ModuleBase
- ${PROJECT_SOURCE_DIR}/src/PartSetPlugin
+# ${PROJECT_SOURCE_DIR}/src/PartSetPlugin
+ ${PROJECT_SOURCE_DIR}/src/GeomAlgoAPI
+ ${PROJECT_SOURCE_DIR}/src/AppElements
${CAS_INCLUDE_DIRS}
${SUIT_INCLUDE})
${CAS_INCLUDE_DIRS}
${SUIT_INCLUDE})