From 126e0b4716421f5b4c45d593fc40290000d34dbe Mon Sep 17 00:00:00 2001 From: Paul RASCLE Date: Sat, 12 Nov 2016 22:54:31 +0100 Subject: [PATCH] tests 1 to 7 OK, 8 and above failed --- src/HYDROPy/CMakeLists.txt | 171 +++++++++---------------------------- 1 file changed, 41 insertions(+), 130 deletions(-) diff --git a/src/HYDROPy/CMakeLists.txt b/src/HYDROPy/CMakeLists.txt index 992d04ae..6eedb591 100644 --- a/src/HYDROPy/CMakeLists.txt +++ b/src/HYDROPy/CMakeLists.txt @@ -33,155 +33,66 @@ SET(_sip_input_file ) SET(_add_SOURCES - sipHYDROPyNCollection_Sequence0100HYDROData_IPolylineSectionType.cc - sipHYDROPyNCollection_Sequence0100Handle_HYDROData_Entity.cc - sipHYDROPyNCollection_Sequence0100TCollection_AsciiString.cc + sipHYDROPycmodule.cc + sipHYDROPygp_XY.cc + sipHYDROPygp_XYZ.cc + sipHYDROPyHYDROData_AltitudeObject.cc + sipHYDROPyHYDROData_Application.cc + sipHYDROPyHYDROData_ArtificialObject.cc + sipHYDROPyHYDROData_BathymetryAltitudePoint.cc + sipHYDROPyHYDROData_Bathymetry.cc + sipHYDROPyHYDROData_CalculationCase.cc + sipHYDROPyHYDROData_Channel.cc + sipHYDROPyHYDROData_Confluence.cc + sipHYDROPyHYDROData_Digue.cc + sipHYDROPyHYDROData_Document.cc + sipHYDROPyHYDROData_Entity.cc + sipHYDROPyHYDROData_IAltitudeObject.cc + sipHYDROPyHYDROData_IInterpolator.cc + sipHYDROPyHYDROData_Image.cc + sipHYDROPyHYDROData_ImmersibleZone.cc + sipHYDROPyHYDROData_IPolyline.cc + sipHYDROPyHYDROData_IProfilesInterpolator.cc + sipHYDROPyHYDROData_LandCoverMap.cc + sipHYDROPyHYDROData_NaturalObject.cc + sipHYDROPyHYDROData_Object.cc + sipHYDROPyHYDROData_ObstacleAltitude.cc + sipHYDROPyHYDROData_Obstacle.cc + sipHYDROPyHYDROData_Polyline3D.cc + sipHYDROPyHYDROData_PolylineXY.cc + sipHYDROPyHYDROData_Profile.cc + sipHYDROPyHYDROData_ProfileUZ.cc + sipHYDROPyHYDROData_Region.cc + sipHYDROPyHYDROData_River.cc + sipHYDROPyHYDROData_ShapesGroup.cc + sipHYDROPyHYDROData_SplitShapesGroup.cc + sipHYDROPyHYDROData_StreamAltitude.cc + sipHYDROPyHYDROData_Stream.cc + sipHYDROPyHYDROData_StricklerTable.cc + sipHYDROPyHYDROData_Zone.cc sipHYDROPyNCollection_Sequence0100gp_XY.cc sipHYDROPyNCollection_Sequence0100gp_XYZ.cc + sipHYDROPyNCollection_Sequence0100Handle_HYDROData_Entity.cc + sipHYDROPyNCollection_Sequence0100HYDROData_IPolylineSectionType.cc + sipHYDROPyNCollection_Sequence0100TCollection_AsciiString.cc sipHYDROPyNCollection_Sequence1800.cc sipHYDROPyNCollection_Sequence2400.cc sipHYDROPyNCollection_Sequence2600.cc - sipHYDROPyTCollection_AsciiString.cc sipHYDROPystdvector0100HYDROData_BathymetryAltitudePoint.cc sipHYDROPystdvector1800.cc sipHYDROPystdvector2400.cc sipHYDROPystdvector2600.cc - sipHYDROPyHYDROData_BathymetryAltitudePoint.cc + sipHYDROPyTCollection_AsciiString.cc ) -# SET(_sip_output_files -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPycmodule.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPygp_XY.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPygp_XYZ.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_AltitudeObject.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Application.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_ArtificialObject.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Bathymetry.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_CalculationCase.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Channel.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Confluence.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Digue.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Document.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Entity.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_IAltitudeObject.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_IInterpolator.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Image.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_ImmersibleZone.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_IPolyline.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_IProfilesInterpolator.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_LandCoverMap.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_NaturalObject.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Object.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Obstacle.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_ObstacleAltitude.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Polyline3D.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_PolylineXY.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Profile.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_ProfileUZ.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Region.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_River.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_ShapesGroup.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_SplitShapesGroup.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Stream.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_StreamAltitude.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_StricklerTable.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Zone.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyNCollection_Sequence0100gp_XY.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyNCollection_Sequence0100gp_XYZ.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyNCollection_Sequence0100Handle_HYDROData_Entity.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyNCollection_Sequence0100HYDROData_IPolylineSectionType.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyNCollection_Sequence0100TCollection_AsciiString.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyNCollection_Sequence1800.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyNCollection_Sequence2400.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyNCollection_Sequence2600.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyTCollection_AsciiString.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPystdvector0100HYDROData_BathymetryAltitudePoint.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPystdvector1800.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPystdvector2400.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPystdvector2600.cc -# ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_BathymetryAltitudePoint.cc -# ) - -# ADD_CUSTOM_COMMAND( -# OUTPUT ${_sip_output_files} -# COMMAND ${SIP_EXECUTABLE} ${PYQT_SIPFLAGS} ${CMAKE_CURRENT_SOURCE_DIR}/${_sip_input_file} -# MAIN_DEPENDENCY ${_sip_input_file} -# ) - -# +SET(_sip_output_files -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPycmodule.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPygp_XY.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPygp_XYZ.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_AltitudeObject.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Application.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_ArtificialObject.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Bathymetry.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_CalculationCase.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Channel.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Confluence.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Digue.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Document.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Entity.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_IAltitudeObject.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_IInterpolator.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Image.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_ImmersibleZone.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_IPolyline.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_IProfilesInterpolator.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_LandCoverMap.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_NaturalObject.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Object.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Obstacle.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_ObstacleAltitude.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Polyline3D.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_PolylineXY.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Profile.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_ProfileUZ.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Region.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_River.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_ShapesGroup.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_SplitShapesGroup.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Stream.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_StreamAltitude.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_StricklerTable.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Zone.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyNCollection_Sequence0100gp_XY.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyNCollection_Sequence0100gp_XYZ.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyNCollection_Sequence0100Handle_HYDROData_Entity.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyNCollection_Sequence0100HYDROData_IPolylineSectionType.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyNCollection_Sequence0100TCollection_AsciiString.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyNCollection_Sequence1800.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyNCollection_Sequence2400.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyNCollection_Sequence2600.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyTCollection_AsciiString.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPystdvector0100HYDROData_BathymetryAltitudePoint.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPystdvector1800.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPystdvector2400.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPystdvector2600.cc -# + ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_BathymetryAltitudePoint.cc -# ) -# -# -# --- sources --- -# - - # sources / sip wrappings PYQT4_WRAP_SIP(_sip_SOURCES ${_sip_input_file} SOURCES ${_add_SOURCES}) # sources / to compile SET(HYDROPy_SOURCES ${_sip_SOURCES}) -# -# --- rules --- -# +ADD_CUSTOM_COMMAND( -# + OUTPUT ${_sip_output_files} -# + COMMAND ${SIP_EXECUTABLE} ${PYQT_SIPFLAGS} ${CMAKE_CURRENT_SOURCE_DIR}/${_sip_input_file} -# + MAIN_DEPENDENCY ${_sip_input_file} -# +) -# ADD_LIBRARY(HYDROPy ${HYDROPy_SOURCES}) -# +ADD_LIBRARY(HYDROPy ${_sip_output_files} ) -#ADD_LIBRARY(HYDROPy ${_sip_output_files} ) - TARGET_LINK_LIBRARIES(HYDROPy ${_link_LIBRARIES}) INSTALL(TARGETS HYDROPy EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) -- 2.39.2