X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FCMakeLists.txt;h=18acca61c4c18793beefc7290f568303b6e60079;hb=fdd7dcde36312e41d8ffb63ec58a77567e8592ef;hp=79f867e86b32ce9e7c7775005f9c56aac28ab818;hpb=673dec9f9917e5f19c876fb1fd4b10e307b2058d;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/CMakeLists.txt b/src/HYDROGUI/CMakeLists.txt index 79f867e8..18acca61 100644 --- a/src/HYDROGUI/CMakeLists.txt +++ b/src/HYDROGUI/CMakeLists.txt @@ -1,24 +1,56 @@ -include(../../CMake/Common.cmake) +#include(../../CMake/Common.cmake) include(../../CMake/UseQT4EXT.cmake) - + set(PROJECT_HEADERS HYDROGUI.h + HYDROGUI_AbstractDisplayer.h + HYDROGUI_AISTrihedron.h + HYDROGUI_BathymetryPrs.h + HYDROGUI_CalculationDlg.h + HYDROGUI_CalculationOp.h + HYDROGUI_ChannelDlg.h + HYDROGUI_ChannelOp.h HYDROGUI_ColorWidget.h + HYDROGUI_CopyPasteOp.h + HYDROGUI_CopyPastePositionOp.h + HYDROGUI_CurveCreatorProfile.h + HYDROGUI_DataBrowser.h HYDROGUI_DataModel.h + HYDROGUI_DataModelSync.h HYDROGUI_DataObject.h + HYDROGUI_DeleteDlg.h HYDROGUI_DeleteOp.h + HYDROGUI_DigueDlg.h + HYDROGUI_DigueOp.h HYDROGUI_Displayer.h HYDROGUI_ExportImageOp.h HYDROGUI_GVSelector.h + HYDROGUI_ImagePrs.h + HYDROGUI_ImmersibleZoneDlg.h + HYDROGUI_ImmersibleZoneOp.h + HYDROGUI_ImportBathymetryDlg.h + HYDROGUI_ImportBathymetryOp.h HYDROGUI_ImportImageDlg.h HYDROGUI_ImportImageOp.h HYDROGUI_InputPanel.h + HYDROGUI_LocalCSDlg.h + HYDROGUI_LocalCSOp.h HYDROGUI_Module.h + HYDROGUI_NameValidator.h HYDROGUI_ObjSelector.h + HYDROGUI_ObserveImageOp.h + HYDROGUI_OCCDisplayer.h + HYDROGUI_OCCSelector.h HYDROGUI_Operation.h HYDROGUI_Operations.h + HYDROGUI_Poly3DDlg.h + HYDROGUI_Poly3DOp.h HYDROGUI_PolylineDlg.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 @@ -26,32 +58,113 @@ set(PROJECT_HEADERS 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_Polyline.h + HYDROGUI_ShapeBathymetry.h + HYDROGUI_ShapeImage.h HYDROGUI_ShowHideOp.h + HYDROGUI_StreamDlg.h + HYDROGUI_StreamOp.h + HYDROGUI_SubmersibleOp.h HYDROGUI_Tool.h HYDROGUI_TwoImagesDlg.h HYDROGUI_TwoImagesOp.h HYDROGUI_UpdateFlags.h + HYDROGUI_UpdateObjectOp.h + HYDROGUI_VisualStateOp.h + HYDROGUI_VTKPrs.h + HYDROGUI_VTKPrsBathymetry.h + HYDROGUI_VTKPrsBathymetryDriver.h + HYDROGUI_VTKPrsDisplayer.h + HYDROGUI_VTKPrsDriver.h + HYDROGUI_VTKPrsShape.h + HYDROGUI_VTKPrsShapeDriver.h + HYDROGUI_Wizard.h + HYDROGUI_Zone.h + HYDROGUI_ImportGeomObjectOp.h + HYDROGUI_ImportObstacleFromFileOp.h + HYDROGUI_ExportCalculationOp.h + HYDROGUI_GeomObjectDlg.h + HYDROGUI_SetColorOp.h + HYDROGUI_ColorDlg.h + HYDROGUI_ImportProfilesOp.h + HYDROGUI_GeoreferencementDlg.h + HYDROGUI_GeoreferencementOp.h + HYDROGUI_Actor.h + HYDROGUI_BathymetryBoundsOp.h + HYDROGUI_TranslateObstacleDlg.h + HYDROGUI_TranslateObstacleOp.h + HYDROGUI_ListModel.h + HYDROGUI_ZLevelsDlg.h + HYDROGUI_ZLevelsOp.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 + HYDROGUI_RecognizeContoursDlg.h + HYDROGUI_RecognizeContoursOp.h ) QT4_WRAP_CPP(PROJECT_HEADERS_MOC ${PROJECT_HEADERS}) set(PROJECT_SOURCES + HYDROGUI_AbstractDisplayer.cxx + HYDROGUI_AISTrihedron.cxx + HYDROGUI_BathymetryPrs.cxx + HYDROGUI_CalculationDlg.cxx + HYDROGUI_CalculationOp.cxx + HYDROGUI_ChannelDlg.cxx + HYDROGUI_ChannelOp.cxx HYDROGUI_ColorWidget.cxx + HYDROGUI_CopyPasteOp.cxx + HYDROGUI_CopyPastePositionOp.cxx + HYDROGUI_CurveCreatorProfile.cxx + HYDROGUI_DataBrowser.cxx HYDROGUI_DataModel.cxx + HYDROGUI_DataModelSync.cxx HYDROGUI_DataObject.cxx + HYDROGUI_DeleteDlg.cxx HYDROGUI_DeleteOp.cxx + HYDROGUI_DigueDlg.cxx + HYDROGUI_DigueOp.cxx HYDROGUI_Displayer.cxx HYDROGUI_ExportImageOp.cxx HYDROGUI_GVSelector.cxx + HYDROGUI_ImagePrs.cxx + HYDROGUI_ImmersibleZoneDlg.cxx + HYDROGUI_ImmersibleZoneOp.cxx + HYDROGUI_ImportBathymetryDlg.cxx + HYDROGUI_ImportBathymetryOp.cxx HYDROGUI_ImportImageDlg.cxx HYDROGUI_ImportImageOp.cxx HYDROGUI_InputPanel.cxx + HYDROGUI_LocalCSDlg.cxx + HYDROGUI_LocalCSOp.cxx HYDROGUI_Module.cxx + HYDROGUI_NameValidator.cxx HYDROGUI_ObjSelector.cxx + HYDROGUI_ObserveImageOp.cxx + HYDROGUI_OCCDisplayer.cxx + HYDROGUI_OCCSelector.cxx HYDROGUI_Operation.cxx HYDROGUI_Operations.cxx + HYDROGUI_Poly3DDlg.cxx + HYDROGUI_Poly3DOp.cxx HYDROGUI_PolylineDlg.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 @@ -59,32 +172,96 @@ set(PROJECT_SOURCES 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_Polyline.cxx + HYDROGUI_ShapeBathymetry.cxx + HYDROGUI_ShapeImage.cxx HYDROGUI_ShowHideOp.cxx + HYDROGUI_StreamDlg.cxx + HYDROGUI_StreamOp.cxx + HYDROGUI_SubmersibleOp.cxx HYDROGUI_Tool.cxx HYDROGUI_TwoImagesDlg.cxx HYDROGUI_TwoImagesOp.cxx + HYDROGUI_UpdateObjectOp.cxx + HYDROGUI_VisualStateOp.cxx + HYDROGUI_VTKPrs.cxx + HYDROGUI_VTKPrsBathymetry.cxx + HYDROGUI_VTKPrsBathymetryDriver.cxx + HYDROGUI_VTKPrsDisplayer.cxx + HYDROGUI_VTKPrsDriver.cxx + HYDROGUI_VTKPrsShape.cxx + HYDROGUI_VTKPrsShapeDriver.cxx + HYDROGUI_Wizard.cxx + HYDROGUI_Zone.cxx + HYDROGUI_ImportGeomObjectOp.cxx + HYDROGUI_ImportObstacleFromFileOp.cxx + HYDROGUI_ExportCalculationOp.cxx + HYDROGUI_GeomObjectDlg.cxx + HYDROGUI_SetColorOp.cxx + HYDROGUI_ColorDlg.cxx + HYDROGUI_ImportProfilesOp.cxx + HYDROGUI_GeoreferencementDlg.cxx + HYDROGUI_GeoreferencementOp.cxx + HYDROGUI_Actor.cxx + HYDROGUI_BathymetryBoundsOp.cxx + HYDROGUI_TranslateObstacleDlg.cxx + HYDROGUI_TranslateObstacleOp.cxx + HYDROGUI_ListModel.cxx + HYDROGUI_ZLevelsDlg.cxx + HYDROGUI_ZLevelsOp.cxx + HYDROGUI_OrderedListWidget.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 + HYDROGUI_RecognizeContoursDlg.cxx + HYDROGUI_RecognizeContoursOp.cxx ) add_definitions( -DHYDROGUI_EXPORTS ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS} - $(GUI_CXXFLAGS) - $(GEOM_CXXFLAGS) +# $(GUI_CXXFLAGS) + ${GUI_DEFINITIONS} +# $(GEOM_CXXFLAGS) + ${GEOM_DEFINITIONS} ) include_directories( ${CAS_INCLUDE_DIRS} ${QT_INCLUDES} - ${GUI_ROOT_DIR}/include/salome - ${GEOM_ROOT_DIR}/include/salome +# ${GUI_ROOT_DIR}/include/salome + ${GUI_INCLUDE_DIRS} +# ${GEOM_ROOT_DIR}/include/salome + ${GEOM_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../HYDROData - ${CMAKE_CURRENT_SOURCE_DIR}/../HYDROOperations + ${VTK_INCLUDE_DIRS} ) + 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 + ${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} ${GEOM_CurveCreator} + ${VTK_LIBRARIES} ${SVTK} ${SalomeObject} ${SalomePrs} + ) + +INSTALL(TARGETS HYDROGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) set(PROJECT_LIBRARIES HYDROGUI) @@ -94,12 +271,33 @@ set(GUITS_SOURCES resources/HYDROGUI_msg_fr.ts ) -include(../../CMake/CommonInstall.cmake) +#include(../../CMake/CommonInstall.cmake) # resources -QT4_INSTALL_TS_RESOURCES("${GUITS_SOURCES}" "${HYDRO_salomeres_DATA}") +QT4_INSTALL_TS_RESOURCES("${GUITS_SOURCES}" "${SALOME_HYDRO_INSTALL_RES_DATA}") 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}) +INSTALL(FILES ${GUI_DATA} DESTINATION ${SALOME_HYDRO_INSTALL_RES_DATA}) + +# tests +if(SALOME_BUILD_TESTS) + + set(TEST_HEADERS + test_HYDROGUI_ListModel.h + ) + + set(TEST_SOURCES + test_HYDROGUI_Main.cxx + test_HYDROGUI_ListModel.cxx + ) + + set(TEST_EXE test_HYDROGUI) + include(../../CMake/CPPUnitTests.cmake) + target_link_libraries(test_HYDROGUI ${CPPUNIT_LIBRARIES} HYDROData HYDROGUI) + + INSTALL(TARGETS test_HYDROGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS}) + +endif(SALOME_BUILD_TESTS) +