refs #1327: improvements for bathymetry presentation and rescale

[modules/hydro.git] / src / HYDROPy / CMakeLists.txt

diff --git a/src/HYDROPy/CMakeLists.txt b/src/HYDROPy/CMakeLists.txt
index 6eedb591ddb1668487211ef4de7fda5a4ad3d22d..9ed9e053a0a4ca8f1655963fb742da3fb4aeb5f7 100644 (file)
--- a/src/HYDROPy/CMakeLists.txt
+++ b/src/HYDROPy/CMakeLists.txt
@@ -1,5 +1,5 @@
 include(../../CMake/Common.cmake)
-include(UsePyQt4)
+INCLUDE(UsePyQt)
 
 # additional include directories
 INCLUDE_DIRECTORIES(
@@ -25,15 +25,9 @@ SET(_link_LIBRARIES
   HYDROData
 )
 
-# --- resources ---
-
-# sip files / to be processed by sip
-SET(_sip_input_file
-  HYDROData.sip
-)
-
 SET(_add_SOURCES
   sipHYDROPycmodule.cc
+  sipHYDROPyNCollection_Sequence0600opencascadehandle0100HYDROData_Entity.cc
   sipHYDROPygp_XY.cc
   sipHYDROPygp_XYZ.cc
   sipHYDROPyHYDROData_AltitudeObject.cc
@@ -72,7 +66,6 @@ SET(_add_SOURCES
   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
@@ -85,13 +78,13 @@ SET(_add_SOURCES
   sipHYDROPyTCollection_AsciiString.cc
 )
 
+set_source_files_properties( ${_add_SOURCES} PROPERTIES GENERATED TRUE )
+
 # sources / sip wrappings
-PYQT4_WRAP_SIP(_sip_SOURCES ${_sip_input_file} SOURCES ${_add_SOURCES})
+PYQT_WRAP_SIP( _sip_SOURCES HYDROData.sip )
 
 # sources / to compile
-SET(HYDROPy_SOURCES ${_sip_SOURCES})
-
-ADD_LIBRARY(HYDROPy ${HYDROPy_SOURCES})
+ADD_LIBRARY( HYDROPy ${_sip_SOURCES} ${_add_SOURCES} )
 
 TARGET_LINK_LIBRARIES(HYDROPy ${_link_LIBRARIES})
 INSTALL(TARGETS HYDROPy EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})