X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FCMakeLists.txt;h=40a5fe2f524397395f184791a078e1ec6a11d5e3;hb=70d38dcb6304ea526362782176be0192276107f6;hp=4c7579db143dc2b4f58db0b5b909a31875c368a2;hpb=597c8ff37c820d683af565f5d7507de002e489e0;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/CMakeLists.txt b/src/HYDROGUI/CMakeLists.txt index 4c7579db..40a5fe2f 100644 --- a/src/HYDROGUI/CMakeLists.txt +++ b/src/HYDROGUI/CMakeLists.txt @@ -1,6 +1,6 @@ -#include(../../CMake/Common.cmake) +include(../../CMake/Common.cmake) include(../../CMake/UseQT4EXT.cmake) - + set(PROJECT_HEADERS HYDROGUI.h HYDROGUI_AbstractDisplayer.h @@ -13,26 +13,44 @@ set(PROJECT_HEADERS 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_DataOwner.h HYDROGUI_DeleteDlg.h HYDROGUI_DeleteOp.h HYDROGUI_DigueDlg.h HYDROGUI_DigueOp.h HYDROGUI_Displayer.h + HYDROGUI_DuplicateOp.h HYDROGUI_ExportImageOp.h + HYDROGUI_ExportFileOp.h HYDROGUI_GVSelector.h + HYDROGUI_ImagePrs.h + HYDROGUI_BasicZoneDlg.h HYDROGUI_ImmersibleZoneDlg.h HYDROGUI_ImmersibleZoneOp.h HYDROGUI_ImportBathymetryDlg.h HYDROGUI_ImportBathymetryOp.h HYDROGUI_ImportImageDlg.h HYDROGUI_ImportImageOp.h + HYDROGUI_ImportLandCoverMapOp.h + HYDROGUI_ImportLandCoverMapDlg.h + HYDROGUI_ImportPolylineOp.h + HYDROGUI_ImportSinusXOp.h + HYDROGUI_ExportSinusXOp.h + HYDROGUI_ExportSinusXDlg.h + HYDROGUI_ExportLandCoverMapDlg.h HYDROGUI_InputPanel.h + HYDROGUI_LandCoverMapDlg.h + HYDROGUI_LandCoverMapOp.h + HYDROGUI_LandCoverMapPrs.h HYDROGUI_LocalCSDlg.h HYDROGUI_LocalCSOp.h + HYDROGUI_MergePolylinesDlg.h + HYDROGUI_MergePolylinesOp.h HYDROGUI_Module.h HYDROGUI_NameValidator.h HYDROGUI_ObjSelector.h @@ -47,6 +65,8 @@ set(PROJECT_HEADERS HYDROGUI_PolylineOp.h HYDROGUI_ProfileDlg.h HYDROGUI_ProfileOp.h + HYDROGUI_ProfileInterpolateDlg.h + HYDROGUI_ProfileInterpolateOp.h HYDROGUI_Prs.h HYDROGUI_PrsDriver.h HYDROGUI_PrsImage.h @@ -59,11 +79,20 @@ set(PROJECT_HEADERS HYDROGUI_Region.h HYDROGUI_RemoveImageRefsOp.h HYDROGUI_Shape.h + HYDROGUI_Polyline.h HYDROGUI_ShapeBathymetry.h HYDROGUI_ShapeImage.h + HYDROGUI_ShapeLandCoverMap.h HYDROGUI_ShowHideOp.h + HYDROGUI_SplitPolylinesDlg.h + HYDROGUI_SplitPolylinesOp.h HYDROGUI_StreamDlg.h HYDROGUI_StreamOp.h + HYDROGUI_LineEditDoubleValidator.h + HYDROGUI_StricklerTableDlg.h + HYDROGUI_StricklerTableOp.h + HYDROGUI_StricklerTypeComboBox.h + HYDROGUI_SubmersibleOp.h HYDROGUI_Tool.h HYDROGUI_TwoImagesDlg.h HYDROGUI_TwoImagesOp.h @@ -98,6 +127,19 @@ set(PROJECT_HEADERS 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_PolylineExtractionOp.h + HYDROGUI_ObjListBox.h + HYDROGUI_RecognizeContoursDlg.h + HYDROGUI_RecognizeContoursOp.h + HYDROGUI_LandCoverColoringOp.h + HYDROGUI_SetTransparencyOp.h + HYDROGUI_TransparencyDlg.h ) QT4_WRAP_CPP(PROJECT_HEADERS_MOC ${PROJECT_HEADERS}) @@ -113,26 +155,44 @@ set(PROJECT_SOURCES 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_DataOwner.cxx HYDROGUI_DeleteDlg.cxx HYDROGUI_DeleteOp.cxx HYDROGUI_DigueDlg.cxx HYDROGUI_DigueOp.cxx HYDROGUI_Displayer.cxx + HYDROGUI_DuplicateOp.cxx HYDROGUI_ExportImageOp.cxx + HYDROGUI_ExportFileOp.cxx HYDROGUI_GVSelector.cxx + HYDROGUI_ImagePrs.cxx + HYDROGUI_BasicZoneDlg.cxx HYDROGUI_ImmersibleZoneDlg.cxx HYDROGUI_ImmersibleZoneOp.cxx HYDROGUI_ImportBathymetryDlg.cxx HYDROGUI_ImportBathymetryOp.cxx HYDROGUI_ImportImageDlg.cxx HYDROGUI_ImportImageOp.cxx + HYDROGUI_ImportLandCoverMapOp.cxx + HYDROGUI_ImportLandCoverMapDlg.cxx + HYDROGUI_ImportPolylineOp.cxx + HYDROGUI_ImportSinusXOp.cxx + HYDROGUI_ExportSinusXOp.cxx + HYDROGUI_ExportSinusXDlg.cxx + HYDROGUI_ExportLandCoverMapDlg.cxx HYDROGUI_InputPanel.cxx + HYDROGUI_LandCoverMapDlg.cxx + HYDROGUI_LandCoverMapOp.cxx + HYDROGUI_LandCoverMapPrs.cxx HYDROGUI_LocalCSDlg.cxx HYDROGUI_LocalCSOp.cxx + HYDROGUI_MergePolylinesDlg.cxx + HYDROGUI_MergePolylinesOp.cxx HYDROGUI_Module.cxx HYDROGUI_NameValidator.cxx HYDROGUI_ObjSelector.cxx @@ -147,6 +207,8 @@ set(PROJECT_SOURCES HYDROGUI_PolylineOp.cxx HYDROGUI_ProfileDlg.cxx HYDROGUI_ProfileOp.cxx + HYDROGUI_ProfileInterpolateDlg.cxx + HYDROGUI_ProfileInterpolateOp.cxx HYDROGUI_Prs.cxx HYDROGUI_PrsDriver.cxx HYDROGUI_PrsImage.cxx @@ -159,11 +221,20 @@ set(PROJECT_SOURCES HYDROGUI_Region.cxx HYDROGUI_RemoveImageRefsOp.cxx HYDROGUI_Shape.cxx + HYDROGUI_Polyline.cxx HYDROGUI_ShapeBathymetry.cxx HYDROGUI_ShapeImage.cxx + HYDROGUI_ShapeLandCoverMap.cxx HYDROGUI_ShowHideOp.cxx HYDROGUI_StreamDlg.cxx HYDROGUI_StreamOp.cxx + HYDROGUI_LineEditDoubleValidator.cxx + HYDROGUI_StricklerTableDlg.cxx + HYDROGUI_StricklerTableOp.cxx + HYDROGUI_StricklerTypeComboBox.cxx + HYDROGUI_SplitPolylinesDlg.cxx + HYDROGUI_SplitPolylinesOp.cxx + HYDROGUI_SubmersibleOp.cxx HYDROGUI_Tool.cxx HYDROGUI_TwoImagesDlg.cxx HYDROGUI_TwoImagesOp.cxx @@ -198,6 +269,20 @@ set(PROJECT_SOURCES 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_PolylineExtractionOp.cxx + HYDROGUI_ObjListBox.cxx + HYDROGUI_RecognizeContoursDlg.cxx + HYDROGUI_RecognizeContoursOp.cxx + HYDROGUI_LandCoverColoringOp.cxx + HYDROGUI_SetTransparencyOp.cxx + HYDROGUI_TransparencyDlg.cxx ) add_definitions( @@ -214,28 +299,25 @@ add_definitions( include_directories( ${CAS_INCLUDE_DIRS} ${QT_INCLUDES} -# ${GUI_ROOT_DIR}/include/salome ${GUI_INCLUDE_DIRS} -# ${GEOM_ROOT_DIR}/include/salome ${GEOM_INCLUDE_DIRS} - ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/../shapelib ${CMAKE_CURRENT_SOURCE_DIR}/../HYDROData - ${CMAKE_CURRENT_SOURCE_DIR}/../HYDROCurveCreator ${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 shapelib ${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} ) INSTALL(TARGETS HYDROGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) -set(PROJECT_LIBRARIES HYDROGUI) +set(PROJECT_LIBRARIES shapelib HYDROGUI) set(GUITS_SOURCES resources/HYDROGUI_images.ts @@ -250,26 +332,6 @@ 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}) +FILE(GLOB GUITXT_DATA "${CMAKE_CURRENT_SOURCE_DIR}/resources/*.txt") +SET(GUI_DATA ${GUIPNG_DATA} ${GUIXML_DATA} ${GUITXT_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) -