39 lines
1.9 KiB
Diff
39 lines
1.9 KiB
Diff
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
|
|
index 5223038..099d881 100644
|
|
--- a/python/CMakeLists.txt
|
|
+++ b/python/CMakeLists.txt
|
|
@@ -132,7 +132,7 @@ ENDIF(NOT PYQT4_VERSION_NUM LESS 264453)
|
|
# 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
|
|
@@ -147,7 +147,7 @@ INCLUDE_DIRECTORIES(
|
|
# 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)
|
|
IF(QSCI_SIP_DIR)
|
|
SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -I ${QSCI_SIP_DIR})
|
|
ELSE(QSCI_SIP_DIR)
|
|
@@ -182,13 +182,13 @@ FILE(GLOB sip_files_analysis
|
|
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)
|