Skip to content

Commit 14cad93

Browse files
committedOct 4, 2012
setup sip dependencies
1 parent a1a8d1d commit 14cad93

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed
 

‎python/CMakeLists.txt

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,11 @@ IF(PYQT4_VERSION_NUM LESS 264196) # 0x040804
7272
ENDIF(PYQT4_VERSION_NUM LESS 264196)
7373

7474
# core module
75-
FILE(GLOB sip_files_core core/*.sip)
75+
FILE(GLOB_RECURSE sip_files_core core/*.sip)
7676
SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core})
7777
SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.core.api)
7878
ADD_SIP_PYTHON_MODULE(qgis.core core/core.sip qgis_core)
79+
ADD_DEPENDENCIES(python_module_qgis_core ${sip_files_core})
7980

8081
# additional gui includes
8182
INCLUDE_DIRECTORIES(
@@ -87,10 +88,11 @@ INCLUDE_DIRECTORIES(
8788
)
8889

8990
# gui module
90-
FILE(GLOB sip_files_gui gui/*.sip)
91+
FILE(GLOB_RECURSE sip_files_gui gui/*.sip)
9192
SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_gui})
9293
SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.gui.api)
9394
ADD_SIP_PYTHON_MODULE(qgis.gui gui/gui.sip qgis_core qgis_gui)
95+
ADD_DEPENDENCIES(python_module_qgis_gui python_module_qgis_core ${sip_files_gui})
9496

9597
# additional analysis includes
9698
INCLUDE_DIRECTORIES(
@@ -105,16 +107,23 @@ INCLUDE_DIRECTORIES(
105107
)
106108

107109
# analysis module
108-
FILE(GLOB sip_files_analysis analysis/*.sip)
110+
FILE(GLOB sip_files_analysis
111+
analysis/*.sip
112+
analysis/raster/*.sip
113+
analysis/vector/*.sip
114+
analysis/interpolation/*.sip
115+
)
109116
SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_analysis})
110117
SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.analysis.api)
111118
ADD_SIP_PYTHON_MODULE(qgis.analysis analysis/analysis.sip qgis_core qgis_analysis)
119+
ADD_DEPENDENCIES(python_module_qgis_analysis python_module_qgis_core ${sip_files_analysis})
112120

113121
# network-analysis module
114-
FILE(GLOB sip_files_network_analysis analysis/network/*.sip)
122+
FILE(GLOB_RECURSE sip_files_network_analysis analysis/network/*.sip)
115123
SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_network_analysis})
116124
SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.networkanalysis.api)
117125
ADD_SIP_PYTHON_MODULE(qgis.networkanalysis analysis/network/networkanalysis.sip qgis_core qgis_networkanalysis)
126+
ADD_DEPENDENCIES(python_module_qgis_networkanalysis python_module_qgis_core ${sip_files_network_analysis})
118127

119128
SET (QGIS_PYTHON_DIR ${PYTHON_SITE_PACKAGES_DIR}/qgis)
120129

@@ -143,4 +152,3 @@ PYTHON_INSTALL(utils.py ${QGIS_PYTHON_DIR})
143152
PYTHON_INSTALL(console.py ${QGIS_PYTHON_DIR})
144153
PYTHON_INSTALL(console_sci.py ${QGIS_PYTHON_DIR})
145154
PYTHON_INSTALL(help.py ${QGIS_PYTHON_DIR})
146-

‎python/core/raster/qgsrasterlayer.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ class QgsRasterLayer : QgsMapLayer
473473
virtual QStringList subLayers() const;
474474

475475
/** \brief Draws a thumbnail of the rasterlayer into the supplied pixmap pointer */
476-
void thumbnailAsPixmap( QPixmap * theQPixmap );
476+
void thumbnailAsPixmap( QPixmap * theQPixmap ) /Deprecated/;
477477

478478
/** \brief Draws a preview of the rasterlayer into a pixmap */
479479
QPixmap previewAsPixmap( QSize size, QColor bgColor = QColor( 255, 255, 255 ) );

‎src/core/raster/qgsrasterlayer.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,9 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
446446
/** Returns the data provider */
447447
QgsRasterDataProvider* dataProvider();
448448

449-
/** Returns the data provider in a const-correct manner */
449+
/** Returns the data provider in a const-correct manner
450+
@note available in python bindings as constDataProvider()
451+
*/
450452
const QgsRasterDataProvider* dataProvider() const;
451453

452454
/**Synchronises with changes in the datasource

0 commit comments

Comments
 (0)
Please sign in to comment.