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
Linking libraries corrected.
[modules/hydro.git]
/
src
/
HYDROGUI
/
CMakeLists.txt
diff --git
a/src/HYDROGUI/CMakeLists.txt
b/src/HYDROGUI/CMakeLists.txt
index 6225c6ef9484a113825484de11dc71c93e6e9f71..e8bcaaf8fd6b2f1f60e053778a503e963ec6dfa2 100644
(file)
--- a/
src/HYDROGUI/CMakeLists.txt
+++ b/
src/HYDROGUI/CMakeLists.txt
@@
-3,19
+3,31
@@
include(../../CMake/UseQT4EXT.cmake)
set(PROJECT_HEADERS
HYDROGUI.h
set(PROJECT_HEADERS
HYDROGUI.h
+ HYDROGUI_AISCurve.h
+ HYDROGUI_CalculationDlg.h
+ HYDROGUI_CalculationOp.h
HYDROGUI_ColorWidget.h
HYDROGUI_ColorWidget.h
+ HYDROGUI_CopyPasteOp.h
+ HYDROGUI_DataBrowser.h
HYDROGUI_DataModel.h
HYDROGUI_DataObject.h
HYDROGUI_DeleteOp.h
HYDROGUI_Displayer.h
HYDROGUI_ExportImageOp.h
HYDROGUI_GVSelector.h
HYDROGUI_DataModel.h
HYDROGUI_DataObject.h
HYDROGUI_DeleteOp.h
HYDROGUI_Displayer.h
HYDROGUI_ExportImageOp.h
HYDROGUI_GVSelector.h
+ HYDROGUI_ImmersibleZoneDlg.h
+ HYDROGUI_ImmersibleZoneOp.h
+ HYDROGUI_ImportBathymetryDlg.h
+ HYDROGUI_ImportBathymetryOp.h
HYDROGUI_ImportImageDlg.h
HYDROGUI_ImportImageOp.h
HYDROGUI_InputPanel.h
HYDROGUI_Module.h
HYDROGUI_ImportImageDlg.h
HYDROGUI_ImportImageOp.h
HYDROGUI_InputPanel.h
HYDROGUI_Module.h
+ HYDROGUI_NameValidator.h
HYDROGUI_ObjSelector.h
HYDROGUI_ObserveImageOp.h
HYDROGUI_ObjSelector.h
HYDROGUI_ObserveImageOp.h
+ HYDROGUI_OCCDisplayer.h
+ HYDROGUI_OCCSelector.h
HYDROGUI_Operation.h
HYDROGUI_Operations.h
HYDROGUI_PolylineDlg.h
HYDROGUI_Operation.h
HYDROGUI_Operations.h
HYDROGUI_PolylineDlg.h
@@
-27,30
+39,50
@@
set(PROJECT_HEADERS
HYDROGUI_PrsImageFrame.h
HYDROGUI_PrsPolyline.h
HYDROGUI_PrsPolylineDriver.h
HYDROGUI_PrsImageFrame.h
HYDROGUI_PrsPolyline.h
HYDROGUI_PrsPolylineDriver.h
+ HYDROGUI_PrsZone.h
+ HYDROGUI_PrsZoneDriver.h
+ HYDROGUI_Region.h
+ HYDROGUI_RemoveImageRefsOp.h
+ HYDROGUI_Shape.h
HYDROGUI_ShowHideOp.h
HYDROGUI_Tool.h
HYDROGUI_TwoImagesDlg.h
HYDROGUI_TwoImagesOp.h
HYDROGUI_UpdateFlags.h
HYDROGUI_ShowHideOp.h
HYDROGUI_Tool.h
HYDROGUI_TwoImagesDlg.h
HYDROGUI_TwoImagesOp.h
HYDROGUI_UpdateFlags.h
+ HYDROGUI_UpdateImageOp.h
HYDROGUI_VisualStateOp.h
HYDROGUI_VisualStateOp.h
+ HYDROGUI_Wizard.h
+ HYDROGUI_Zone.h
)
QT4_WRAP_CPP(PROJECT_HEADERS_MOC ${PROJECT_HEADERS})
set(PROJECT_SOURCES
)
QT4_WRAP_CPP(PROJECT_HEADERS_MOC ${PROJECT_HEADERS})
set(PROJECT_SOURCES
+ HYDROGUI_AISCurve.cxx
+ HYDROGUI_CalculationDlg.cxx
+ HYDROGUI_CalculationOp.cxx
HYDROGUI_ColorWidget.cxx
HYDROGUI_ColorWidget.cxx
+ HYDROGUI_CopyPasteOp.cxx
+ HYDROGUI_DataBrowser.cxx
HYDROGUI_DataModel.cxx
HYDROGUI_DataObject.cxx
HYDROGUI_DeleteOp.cxx
HYDROGUI_Displayer.cxx
HYDROGUI_ExportImageOp.cxx
HYDROGUI_GVSelector.cxx
HYDROGUI_DataModel.cxx
HYDROGUI_DataObject.cxx
HYDROGUI_DeleteOp.cxx
HYDROGUI_Displayer.cxx
HYDROGUI_ExportImageOp.cxx
HYDROGUI_GVSelector.cxx
+ HYDROGUI_ImmersibleZoneDlg.cxx
+ HYDROGUI_ImmersibleZoneOp.cxx
+ HYDROGUI_ImportBathymetryDlg.cxx
+ HYDROGUI_ImportBathymetryOp.cxx
HYDROGUI_ImportImageDlg.cxx
HYDROGUI_ImportImageOp.cxx
HYDROGUI_InputPanel.cxx
HYDROGUI_Module.cxx
HYDROGUI_ImportImageDlg.cxx
HYDROGUI_ImportImageOp.cxx
HYDROGUI_InputPanel.cxx
HYDROGUI_Module.cxx
+ HYDROGUI_NameValidator.cxx
HYDROGUI_ObjSelector.cxx
HYDROGUI_ObserveImageOp.cxx
HYDROGUI_ObjSelector.cxx
HYDROGUI_ObserveImageOp.cxx
+ HYDROGUI_OCCDisplayer.cxx
+ HYDROGUI_OCCSelector.cxx
HYDROGUI_Operation.cxx
HYDROGUI_Operations.cxx
HYDROGUI_PolylineDlg.cxx
HYDROGUI_Operation.cxx
HYDROGUI_Operations.cxx
HYDROGUI_PolylineDlg.cxx
@@
-62,11
+94,19
@@
set(PROJECT_SOURCES
HYDROGUI_PrsImageFrame.cxx
HYDROGUI_PrsPolyline.cxx
HYDROGUI_PrsPolylineDriver.cxx
HYDROGUI_PrsImageFrame.cxx
HYDROGUI_PrsPolyline.cxx
HYDROGUI_PrsPolylineDriver.cxx
+ HYDROGUI_PrsZone.cxx
+ HYDROGUI_PrsZoneDriver.cxx
+ HYDROGUI_Region.cxx
+ HYDROGUI_RemoveImageRefsOp.cxx
+ HYDROGUI_Shape.cxx
HYDROGUI_ShowHideOp.cxx
HYDROGUI_Tool.cxx
HYDROGUI_TwoImagesDlg.cxx
HYDROGUI_TwoImagesOp.cxx
HYDROGUI_ShowHideOp.cxx
HYDROGUI_Tool.cxx
HYDROGUI_TwoImagesDlg.cxx
HYDROGUI_TwoImagesOp.cxx
+ HYDROGUI_UpdateImageOp.cxx
HYDROGUI_VisualStateOp.cxx
HYDROGUI_VisualStateOp.cxx
+ HYDROGUI_Wizard.cxx
+ HYDROGUI_Zone.cxx
)
add_definitions(
)
add_definitions(
@@
-81,14
+121,16
@@
include_directories(
${CAS_INCLUDE_DIRS}
${QT_INCLUDES}
${GUI_ROOT_DIR}/include/salome
${CAS_INCLUDE_DIRS}
${QT_INCLUDES}
${GUI_ROOT_DIR}/include/salome
- ${GEOM_ROOT_DIR}/include/salome
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../HYDROData
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../HYDROData
- ${CMAKE_CURRENT_SOURCE_DIR}/../HYDRO
Operations
+ ${CMAKE_CURRENT_SOURCE_DIR}/../HYDRO
CurveCreator
)
add_library(HYDROGUI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${PROJECT_HEADERS_MOC})
)
add_library(HYDROGUI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${PROJECT_HEADERS_MOC})
-target_link_libraries(HYDROGUI ${CAS_OCAF} HYDROData HYDROOperations -L${GEOM_ROOT_DIR}/lib/salome/ -lCurveCreator)
+target_link_libraries(HYDROGUI HYDROData HYDROCurveCreator
+ ${CAS_TKV3d} ${CAS_TKTopAlgo} ${CAS_TKBO} ${CAS_TKService}
+ ${LightApp} ${CAM} ${suit} ${qtx} ${ObjBrowser} ${GraphicsView} ${std} ${Event} ${OCCViewer}
+ )
set(PROJECT_LIBRARIES HYDROGUI)
set(PROJECT_LIBRARIES HYDROGUI)
@@
-107,3
+149,4
@@
FILE(GLOB GUIPNG_DATA "${CMAKE_CURRENT_SOURCE_DIR}/resources/*.png")
FILE(GLOB GUIXML_DATA "${CMAKE_CURRENT_SOURCE_DIR}/resources/*.xml")
SET(GUI_DATA ${GUIPNG_DATA} ${GUIXML_DATA})
INSTALL(FILES ${GUI_DATA} DESTINATION ${HYDRO_salomeres_DATA})
FILE(GLOB GUIXML_DATA "${CMAKE_CURRENT_SOURCE_DIR}/resources/*.xml")
SET(GUI_DATA ${GUIPNG_DATA} ${GUIXML_DATA})
INSTALL(FILES ${GUI_DATA} DESTINATION ${HYDRO_salomeres_DATA})
+