X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2FExternalFiles.cmake;h=d85f0af85e313c85013b6cbff8d54603155a8f65;hb=3bece499e83cc9ca95536228c7f6740030e9d5d8;hp=97d01b8e6d9e5fc1711bbf3e25d032d9491ea9a5;hpb=c1d7b9278ed93d33e551c973d8e2d22d5431a34b;p=modules%2Fhydro.git diff --git a/src/HYDRO_tests/ExternalFiles.cmake b/src/HYDRO_tests/ExternalFiles.cmake index 97d01b8e..d85f0af8 100644 --- a/src/HYDRO_tests/ExternalFiles.cmake +++ b/src/HYDRO_tests/ExternalFiles.cmake @@ -1,8 +1,7 @@ -IF (SalomeGUI_VERSION VERSION_LESS "8.0.0") - INCLUDE(UseQt4Ext) -ELSE() - INCLUDE(UseQtExt) -ENDIF() + +find_package( Qt5Core ) +find_package( Qt5Widgets ) +set(CMAKE_AUTOMOC ON) set( EXTERNAL_FILES ../HYDROData/HYDROData_AltitudeObject.cxx @@ -11,7 +10,9 @@ set( EXTERNAL_FILES ../HYDROData/HYDROData_Bathymetry.cxx ../HYDROData/HYDROData_BSplineOperation.cxx ../HYDROData/HYDROData_CalculationCase.cxx + ../HYDROData/HYDROData_CompleteCalcCase.cxx ../HYDROData/HYDROData_Channel.cxx + ../HYDROData/HYDROData_ChannelAltitude.cxx ../HYDROData/HYDROData_Confluence.cxx ../HYDROData/HYDROData_Digue.cxx ../HYDROData/HYDROData_Document.cxx @@ -21,6 +22,8 @@ set( EXTERNAL_FILES ../HYDROData/HYDROData_IInterpolator.cxx ../HYDROData/HYDROData_Image.cxx ../HYDROData/HYDROData_ImmersibleZone.cxx + ../HYDROData/HYDROData_BCPolygon.cxx + ../HYDROData/HYDROData_BoundaryPolygonTools.cxx ../HYDROData/HYDROData_IPolyline.cxx ../HYDROData/HYDROData_Iterator.cxx ../HYDROData/HYDROData_Lambert93.cxx @@ -57,27 +60,55 @@ set( EXTERNAL_FILES ../HYDROData/HYDROData_SinusX.cxx ../HYDROData/HYDROData_ShapeFile.cxx ../HYDROData/HYDROData_LandCoverMap.cxx - - ../HYDROGUI/HYDROGUI_ListModel.cxx + ../HYDROData/HYDROData_Quadtree.cxx + ../HYDROData/HYDROData_QuadtreeNode.cxx + ../HYDROData/HYDROData_LCM_FaceClassifier.cxx + ../HYDROData/HYDROData_DTM.cxx + ../HYDROData/HYDROData_LISM.cxx + ../HYDROData/HYDROData_StreamLinearInterpolation.cxx + ../HYDROGUI/HYDROGUI_AISShape.cxx + ../HYDROGUI/HYDROGUI_AISTrihedron.cxx + ../HYDROGUI/HYDROGUI_BathymetryPrs.cxx + ../HYDROGUI/HYDROGUI_CurveCreatorProfile.cxx ../HYDROGUI/HYDROGUI_DataObject.cxx - ../HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx + ../HYDROGUI/HYDROGUI_InputPanel.cxx ../HYDROGUI/HYDROGUI_LandCoverArgsFilter.cxx + ../HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx + ../HYDROGUI/HYDROGUI_LineEditDoubleValidator.cxx + ../HYDROGUI/HYDROGUI_ListModel.cxx + ../HYDROGUI/HYDROGUI_ListSelector.cxx + ../HYDROGUI/HYDROGUI_OrderedListWidget.cxx + ../HYDROGUI/HYDROGUI_Overview.cxx ../HYDROGUI/HYDROGUI_Polyline.cxx - ../HYDROGUI/HYDROGUI_AISShape.cxx + ../HYDROGUI/HYDROGUI_ProfileDlg.cxx + ../HYDROGUI/HYDROGUI_ShapeBathymetry.cxx ../HYDROGUI/HYDROGUI_Shape.cxx - ../HYDROGUI/HYDROGUI_InputPanel.cxx + ../HYDROGUI/HYDROGUI_StreamDlg.cxx ../HYDROGUI/HYDROGUI_StricklerTableDlg.cxx - ../HYDROGUI/HYDROGUI_LineEditDoubleValidator.cxx ../HYDROGUI/HYDROGUI_Tool.cxx + ../HYDROGUI/HYDROGUI_ViewerDlg.cxx + ../HYDROGUI/HYDROGUI_ZoneTool.cxx ) +# if not -DLIGHT_MODE, to be completed. Link with library HYDROData & HYDROGUI instead +# ../HYDROGUI/HYDROGUI_AbstractDisplayer.cxx +# ../HYDROGUI/HYDROGUI_Displayer.cxx +# ../HYDROGUI/HYDROGUI_Module.cxx +# ../HYDROGUI/HYDROGUI_OCCDisplayer.cxx +# ../HYDROGUI/HYDROGUI_Operations.cxx +# ../HYDROGUI/HYDROGUI_Tool2.cxx +# ../HYDROGUI/HYDROGUI_VTKPrsDisplayer.cxx + -set( MOC_HEADERS +set( MOC_HEADERS ../HYDROGUI/HYDROGUI_InputPanel.h ../HYDROGUI/HYDROGUI_StricklerTableDlg.h + ../HYDROGUI/HYDROGUI_StreamDlg.h + ../HYDROGUI/HYDROGUI_ListSelector.h + ../HYDROGUI/HYDROGUI_OrderedListWidget.h + ../HYDROGUI/HYDROGUI_Overview.h + ../HYDROGUI/HYDROGUI_ZoneTool.h + ../HYDROGUI/HYDROGUI_ProfileDlg.h + ../HYDROGUI/HYDROGUI_ViewerDlg.h ) -IF (SalomeGUI_VERSION VERSION_LESS "8.0.0") - QT4_WRAP_CPP( PROJECT_MOC_HEADERS ${MOC_HEADERS} ) -ELSE() - QT_WRAP_MOC( PROJECT_MOC_HEADERS ${MOC_HEADERS} ) -ENDIF() +#QT5_WRAP_MOC( PROJECT_MOC_HEADERS ${MOC_HEADERS} )