Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.salome-platform.org/modules/hydro
[modules/hydro.git]
/
src
/
HYDROGUI
/
CMakeLists.txt
diff --git
a/src/HYDROGUI/CMakeLists.txt
b/src/HYDROGUI/CMakeLists.txt
index 4c7579db143dc2b4f58db0b5b909a31875c368a2..963da06712ab1426f27691de2403e0b5a8e19c36 100644
(file)
--- a/
src/HYDROGUI/CMakeLists.txt
+++ b/
src/HYDROGUI/CMakeLists.txt
@@
-1,6
+1,6
@@
#include(../../CMake/Common.cmake)
include(../../CMake/UseQT4EXT.cmake)
#include(../../CMake/Common.cmake)
include(../../CMake/UseQT4EXT.cmake)
-
+
set(PROJECT_HEADERS
HYDROGUI.h
HYDROGUI_AbstractDisplayer.h
set(PROJECT_HEADERS
HYDROGUI.h
HYDROGUI_AbstractDisplayer.h
@@
-13,6
+13,7
@@
set(PROJECT_HEADERS
HYDROGUI_ColorWidget.h
HYDROGUI_CopyPasteOp.h
HYDROGUI_CopyPastePositionOp.h
HYDROGUI_ColorWidget.h
HYDROGUI_CopyPasteOp.h
HYDROGUI_CopyPastePositionOp.h
+ HYDROGUI_CurveCreatorProfile.h
HYDROGUI_DataBrowser.h
HYDROGUI_DataModel.h
HYDROGUI_DataModelSync.h
HYDROGUI_DataBrowser.h
HYDROGUI_DataModel.h
HYDROGUI_DataModelSync.h
@@
-47,6
+48,8
@@
set(PROJECT_HEADERS
HYDROGUI_PolylineOp.h
HYDROGUI_ProfileDlg.h
HYDROGUI_ProfileOp.h
HYDROGUI_PolylineOp.h
HYDROGUI_ProfileDlg.h
HYDROGUI_ProfileOp.h
+ HYDROGUI_ProfileInterpolateDlg.h
+ HYDROGUI_ProfileInterpolateOp.h
HYDROGUI_Prs.h
HYDROGUI_PrsDriver.h
HYDROGUI_PrsImage.h
HYDROGUI_Prs.h
HYDROGUI_PrsDriver.h
HYDROGUI_PrsImage.h
@@
-98,6
+101,12
@@
set(PROJECT_HEADERS
HYDROGUI_OrderedListWidget.h
HYDROGUI_ListSelector.h
HYDROGUI_ZLayers.h
HYDROGUI_OrderedListWidget.h
HYDROGUI_ListSelector.h
HYDROGUI_ZLayers.h
+ HYDROGUI_PriorityWidget.h
+ HYDROGUI_PriorityTableModel.h
+ HYDROGUI_RiverBottomDlg.h
+ HYDROGUI_RiverBottomOp.h
+ HYDROGUI_ViewerDlg.h
+ HYDROGUI_ObjComboBox.h
)
QT4_WRAP_CPP(PROJECT_HEADERS_MOC ${PROJECT_HEADERS})
)
QT4_WRAP_CPP(PROJECT_HEADERS_MOC ${PROJECT_HEADERS})
@@
-113,6
+122,7
@@
set(PROJECT_SOURCES
HYDROGUI_ColorWidget.cxx
HYDROGUI_CopyPasteOp.cxx
HYDROGUI_CopyPastePositionOp.cxx
HYDROGUI_ColorWidget.cxx
HYDROGUI_CopyPasteOp.cxx
HYDROGUI_CopyPastePositionOp.cxx
+ HYDROGUI_CurveCreatorProfile.cxx
HYDROGUI_DataBrowser.cxx
HYDROGUI_DataModel.cxx
HYDROGUI_DataModelSync.cxx
HYDROGUI_DataBrowser.cxx
HYDROGUI_DataModel.cxx
HYDROGUI_DataModelSync.cxx
@@
-147,6
+157,8
@@
set(PROJECT_SOURCES
HYDROGUI_PolylineOp.cxx
HYDROGUI_ProfileDlg.cxx
HYDROGUI_ProfileOp.cxx
HYDROGUI_PolylineOp.cxx
HYDROGUI_ProfileDlg.cxx
HYDROGUI_ProfileOp.cxx
+ HYDROGUI_ProfileInterpolateDlg.cxx
+ HYDROGUI_ProfileInterpolateOp.cxx
HYDROGUI_Prs.cxx
HYDROGUI_PrsDriver.cxx
HYDROGUI_PrsImage.cxx
HYDROGUI_Prs.cxx
HYDROGUI_PrsDriver.cxx
HYDROGUI_PrsImage.cxx
@@
-198,6
+210,13
@@
set(PROJECT_SOURCES
HYDROGUI_ListSelector.cxx
HYDROGUI_ZLayers.cxx
HYDROGUI_ZLayers2.cxx
HYDROGUI_ListSelector.cxx
HYDROGUI_ZLayers.cxx
HYDROGUI_ZLayers2.cxx
+ HYDROGUI_ZLayers3.cxx
+ HYDROGUI_PriorityWidget.cxx
+ HYDROGUI_PriorityTableModel.cxx
+ HYDROGUI_RiverBottomDlg.cxx
+ HYDROGUI_RiverBottomOp.cxx
+ HYDROGUI_ViewerDlg.cxx
+ HYDROGUI_ObjComboBox.cxx
)
add_definitions(
)
add_definitions(
@@
-220,16
+239,15
@@
include_directories(
${GEOM_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../HYDROData
${GEOM_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../HYDROData
- ${CMAKE_CURRENT_SOURCE_DIR}/../HYDROCurveCreator
${VTK_INCLUDE_DIRS}
)
add_library(HYDROGUI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${PROJECT_HEADERS_MOC})
${VTK_INCLUDE_DIRS}
)
add_library(HYDROGUI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${PROJECT_HEADERS_MOC})
-target_link_libraries(HYDROGUI HYDROData
HYDROCurveCreator
+target_link_libraries(HYDROGUI HYDROData
${CAS_TKV3d} ${CAS_TKTopAlgo} ${CAS_TKBrep} ${CAS_TKBO}
${GUI_LightApp} ${GUI_CAM} ${GUI_suit} ${GUI_qtx} ${GUI_ObjBrowser} ${GUI_GraphicsView} ${GUI_std}
${CAS_TKV3d} ${CAS_TKTopAlgo} ${CAS_TKBrep} ${CAS_TKBO}
${GUI_LightApp} ${GUI_CAM} ${GUI_suit} ${GUI_qtx} ${GUI_ObjBrowser} ${GUI_GraphicsView} ${GUI_std}
- ${GUI_Event} ${GUI_OCCViewer} ${GEOM_GEOM} ${GEOM_GEOMBase}
+ ${GUI_Event} ${GUI_OCCViewer} ${GEOM_GEOM} ${GEOM_GEOMBase}
${GEOM_CurveCreator}
${VTK_LIBRARIES} ${SVTK} ${SalomeObject} ${SalomePrs}
)
${VTK_LIBRARIES} ${SVTK} ${SalomeObject} ${SalomePrs}
)