38 lines
1.9 KiB
Diff
38 lines
1.9 KiB
Diff
diff -Nur qgis-2.0.0/python/CMakeLists.txt qgis-2.0.0-sip410/python/CMakeLists.txt
|
|
--- qgis-2.0.0/python/CMakeLists.txt 2013-09-09 03:53:04.000000000 +0200
|
|
+++ qgis-2.0.0-sip410/python/CMakeLists.txt 2013-09-10 00:20:53.553086242 +0200
|
|
@@ -75,7 +75,7 @@
|
|
# core module
|
|
FILE(GLOB_RECURSE sip_files_core core/*.sip)
|
|
SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core})
|
|
-SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.core.api)
|
|
+SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -a ${CMAKE_BINARY_DIR}/python/qgis.core.api)
|
|
ADD_SIP_PYTHON_MODULE(qgis.core core/core.sip qgis_core)
|
|
|
|
# additional gui includes
|
|
@@ -90,7 +90,7 @@
|
|
# gui module
|
|
FILE(GLOB_RECURSE sip_files_gui gui/*.sip)
|
|
SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_gui})
|
|
-SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.gui.api)
|
|
+SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -a ${CMAKE_BINARY_DIR}/python/qgis.gui.api)
|
|
ADD_SIP_PYTHON_MODULE(qgis.gui gui/gui.sip qgis_core qgis_gui)
|
|
|
|
# additional analysis includes
|
|
@@ -113,13 +113,13 @@
|
|
analysis/interpolation/*.sip
|
|
)
|
|
SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_analysis})
|
|
-SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.analysis.api)
|
|
+SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -a ${CMAKE_BINARY_DIR}/python/qgis.analysis.api)
|
|
ADD_SIP_PYTHON_MODULE(qgis.analysis analysis/analysis.sip qgis_core qgis_analysis)
|
|
|
|
# network-analysis module
|
|
FILE(GLOB_RECURSE sip_files_network_analysis analysis/network/*.sip)
|
|
SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_network_analysis})
|
|
-SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.networkanalysis.api)
|
|
+SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -a ${CMAKE_BINARY_DIR}/python/qgis.networkanalysis.api)
|
|
ADD_SIP_PYTHON_MODULE(qgis.networkanalysis analysis/network/networkanalysis.sip qgis_core qgis_networkanalysis)
|
|
|
|
SET(QGIS_PYTHON_DIR ${PYTHON_SITE_PACKAGES_DIR}/qgis)
|