## From KERNEL:
##
-# Mandatory products
-FIND_PACKAGE(SalomePython REQUIRED)
+# Mandatory products:
+
+FIND_PACKAGE(SalomePythonInterp REQUIRED)
+FIND_PACKAGE(SalomePythonLibs REQUIRED)
+FIND_PACKAGE(SalomeCAS REQUIRED)
+FIND_PACKAGE(SalomeVTK REQUIRED)
+FIND_PACKAGE(SalomeOmniORB REQUIRED)
# Optional products:
+
IF(SALOME_BUILD_TESTS)
ENABLE_TESTING()
FIND_PACKAGE(SalomeCppUnit)
SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC)
ENDIF()
-# Find optional GUI libraries
-IF(SALOME_BUILD_GUI)
- # Qt4
- FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
-ENDIF(SALOME_BUILD_GUI)
-
##
-## HYDRO specifics
+## From GUI:
##
-FIND_PACKAGE(SalomeCAS REQUIRED)
-
-FIND_PACKAGE(SalomeVTK REQUIRED)
-
FIND_PACKAGE(SalomeSIP REQUIRED) # should come after Python and before PyQt4
-FIND_PACKAGE(SalomePyQt4 REQUIRED)
+# Qt
+IF(NOT SALOME_GUI_BUILD_WITH_QT5)
+ FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml QtWebKit QtOpenGL QtNetwork QtTest)
+ SET(QT_ROOT_DIR "${QT4_ROOT_DIR}")
+ SALOME_CONFIGURE_PREPARE(HYDROData HYDROGUI HYDROPy Qt4 PyQt4)
+ELSE()
+ FIND_PACKAGE(SalomeQt5 REQUIRED)
+ SET(QT_ROOT_DIR "${QT5_ROOT_DIR}")
+ SALOME_CONFIGURE_PREPARE(HYDROData HYDROGUI HYDROPy Qt5 PyQt5)
+ENDIF()
-FIND_PACKAGE(SalomeOmniORB REQUIRED)
+# PyQt
+IF(NOT SALOME_GUI_BUILD_WITH_QT5)
+ FIND_PACKAGE(SalomePyQt4 REQUIRED)
+ SET(PYQT_ROOT_DIR "${PYQT4_ROOT_DIR}")
+ELSE()
+ FIND_PACKAGE(SalomePyQt5 REQUIRED)
+ SET(PYQT_ROOT_DIR "${PYQT5_ROOT_DIR}")
+ENDIF()
# Detection summary:
SALOME_PACKAGE_REPORT_AND_CHECK()
# Sources
# ========
ADD_SUBDIRECTORY (src/shapelib)
+ADD_SUBDIRECTORY (src/HYDRO_tests)
ADD_SUBDIRECTORY (src/HYDROData)
ADD_SUBDIRECTORY (src/HYDROGUI)
ADD_SUBDIRECTORY (src/HYDROPy)
-ADD_SUBDIRECTORY (src/HYDROTools)
-ADD_SUBDIRECTORY (src/HYDRO_tests)
IF(SALOME_BUILD_DOC)
ADD_SUBDIRECTORY(doc)
ENDIF()
include(../../CMake/Common.cmake)
-include(../../CMake/UsePyQt4EXT.cmake)
+include(UsePyQt4)
# --- options ---
# --- resources ---
# sip files / to be processed by sip
-
-# TODO: fix the PYQT4_WRAP_SIP and uncomment
-# SET(_sip_files
-# HYDROData.sip
-# HYDROData_Entity.sip
-# HYDROData_Object.sip
-# HYDROData_ArtificialObject.sip
-# HYDROData_NaturalObject.sip
-# HYDROData_Image.sip
-# HYDROData_Polyline.sip
-# HYDROData_Bathymetry.sip
-# HYDROData_ImmersibleZone.sip
-# HYDROData_Zone.sip
-# HYDROData_Region.sip
-# HYDROData_StricklerTable.sip
-# HYDROData_CalculationCase.sip
-# HYDROData_Document.sip
-# )
-
-# workaround while PYQT4_WRAP_SIP is not corrected
SET(_sip_files
HYDROData.sip
-)
-
-SET(_sip_files2
- CAS/gp_XY.sip
- CAS/gp_XYZ.sip
- CAS/NCollection_Sequence.sip
- CAS/TCollection_AsciiString.sip
- HYDROData_SequenceOfObjects.sip
- HYDROData_IInterpolator.sip
- HYDROData_Entity.sip
- HYDROData_ShapesGroup.sip
- HYDROData_SplitShapesGroup.sip
- HYDROData_IPolyline.sip
- HYDROData_IAltitudeObject.sip
HYDROData_AltitudeObject.sip
- HYDROData_ObstacleAltitude.sip
- HYDROData_StreamAltitude.sip
- HYDROData_Object.sip
- HYDROData_Profile.sip
- HYDROData_Polyline3D.sip
- HYDROData_ProfileUZ.sip
- HYDROData_PolylineXY.sip
+ HYDROData_Application.sip
HYDROData_ArtificialObject.sip
- HYDROData_Obstacle.sip
+ HYDROData_Bathymetry.sip
+ HYDROData_CalculationCase.sip
HYDROData_Channel.sip
+ HYDROData_Confluence.sip
HYDROData_Digue.sip
+ HYDROData_Document.sip
+ HYDROData_Entity.sip
+ HYDROData_IAltitudeObject.sip
+ HYDROData_IInterpolator.sip
+ HYDROData_Image.sip
+ HYDROData_ImmersibleZone.sip
+ HYDROData_IPolyline.sip
+ HYDROData_IProfilesInterpolator.sip
+ HYDROData_LandCoverMap.sip
HYDROData_NaturalObject.sip
- HYDROData_Confluence.sip
+ HYDROData_Object.sip
+ HYDROData_ObstacleAltitude.sip
+ HYDROData_Obstacle.sip
+ HYDROData_Polyline3D.sip
+ HYDROData_PolylineXY.sip
+ HYDROData_Profile.sip
+ HYDROData_ProfileUZ.sip
+ HYDROData_Region.sip
HYDROData_River.sip
+ HYDROData_SequenceOfObjects.sip
+ HYDROData_ShapesGroup.sip
+ HYDROData_SplitShapesGroup.sip
+ HYDROData_StreamAltitude.sip
HYDROData_Stream.sip
HYDROData_StricklerTable.sip
- HYDROData_Image.sip
- HYDROData_Bathymetry.sip
- HYDROData_ImmersibleZone.sip
HYDROData_Zone.sip
- HYDROData_Region.sip
- HYDROData_CalculationCase.sip
- HYDROData_Document.sip
- HYDROData_Application.sip
- HYDROData_IProfilesInterpolator.sip
- HYDROData_LandCoverMap.sip
+ CAS/gp_XY.sip
+ CAS/gp_XYZ.sip
+ CAS/NCollection_Sequence.sip
+ CAS/TCollection_AsciiString.sip
+)
+
+SET(_add_SOURCES
+ sipHYDROPyNCollection_Sequence0100HYDROData_IPolylineSectionType.cc
+ sipHYDROPyNCollection_Sequence0100Handle_HYDROData_Entity.cc
+ sipHYDROPyNCollection_Sequence0100TCollection_AsciiString.cc
+ sipHYDROPyNCollection_Sequence0100gp_XY.cc
+ sipHYDROPyNCollection_Sequence0100gp_XYZ.cc
+ sipHYDROPyNCollection_Sequence1800.cc
+ sipHYDROPyNCollection_Sequence2400.cc
+ sipHYDROPyNCollection_Sequence2600.cc
+ sipHYDROPyTCollection_AsciiString.cc
)
# --- sources ---
# sources / sip wrappings
-PYQT4_WRAP_SIP_EXT(_sip_SOURCES ${_sip_files})
+PYQT4_WRAP_SIP(_sip_SOURCES ${_sip_files} SOURCES ${_add_SOURCES})
# sources / to compile
-SET(HYDROPy_SOURCES ${_sip_SOURCES} ${_sip_files2})
+SET(HYDROPy_SOURCES ${_sip_SOURCES})
# --- rules ---