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 'master' of newgeom:newgeom
[modules/shaper.git]
/
src
/
XGUI
/
CMakeLists.txt
diff --git
a/src/XGUI/CMakeLists.txt
b/src/XGUI/CMakeLists.txt
index eca046d10873a0841c3b6ada09da6d91085059ac..5ceda79603cc6772b9892f5b90e4443776859be6 100644
(file)
--- a/
src/XGUI/CMakeLists.txt
+++ b/
src/XGUI/CMakeLists.txt
@@
-25,13
+25,14
@@
SET(PROJECT_HEADERS
XGUI_SalomeConnector.h
XGUI_ActionsMgr.h
XGUI_ErrorDialog.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_Selection.h
XGUI_Preferences.h
XGUI_ViewerProxy.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
)
SET(PROJECT_AUTOMOC
@@
-64,6
+65,7
@@
SET(PROJECT_SOURCES
XGUI_ModuleConnector.cpp
XGUI_Selection.cpp
XGUI_Preferences.cpp
XGUI_ModuleConnector.cpp
XGUI_Selection.cpp
XGUI_Preferences.cpp
+ XGUI_QtEvents.cpp
)
SET(PROJECT_RESOURCES
)
SET(PROJECT_RESOURCES
@@
-81,15
+83,17
@@
SET(TEXT_RESOURCES
SET(PROJECT_LIBRARIES
Events
Config
SET(PROJECT_LIBRARIES
Events
Config
+ ModelAPI
+ ModuleBase
${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)
@@
-120,6
+124,7
@@
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/src/Events
${PROJECT_SOURCE_DIR}/src/GeomAPI
${PROJECT_SOURCE_DIR}/src/ModuleBase
${PROJECT_SOURCE_DIR}/src/PartSetPlugin
${PROJECT_SOURCE_DIR}/src/GeomAPI
${PROJECT_SOURCE_DIR}/src/ModuleBase
${PROJECT_SOURCE_DIR}/src/PartSetPlugin
+ ${PROJECT_SOURCE_DIR}/src/GeomAlgoAPI
${CAS_INCLUDE_DIRS}
${SUIT_INCLUDE})
${CAS_INCLUDE_DIRS}
${SUIT_INCLUDE})