From 86c3e8b8a6ce2f59f851e5b03ba57f88ab14b161 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Wed, 4 Jul 2018 23:34:20 +0200 Subject: [PATCH] fix build crashes with SIP 4.19.11 --- python/CMakeLists.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index de51d3a3fe2..a7f8698fe6c 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -172,6 +172,9 @@ ENDIF(${SIP_VERSION_STR} VERSION_GREATER 4.19.6) FILE(GLOB_RECURSE sip_files_core core/*.sip core/*.sip.in) SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core}) SET(SIP_EXTRA_OPTIONS ${PYQT_SIP_FLAGS} -g -o -a ${CMAKE_BINARY_DIR}/python/qgis.core.api) +IF((${SIP_VERSION_STR} VERSION_EQUAL 4.19.11) OR (${SIP_VERSION_STR} VERSION_GREATER 4.19.11)) + SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -n sip) +ENDIF((${SIP_VERSION_STR} VERSION_EQUAL 4.19.11) OR (${SIP_VERSION_STR} VERSION_GREATER 4.19.11)) IF((${SIP_VERSION_STR} VERSION_EQUAL 4.18) OR (${SIP_VERSION_STR} VERSION_GREATER 4.18)) SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -y ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_core.pyi) ENDIF((${SIP_VERSION_STR} VERSION_EQUAL 4.18) OR (${SIP_VERSION_STR} VERSION_GREATER 4.18)) @@ -193,6 +196,9 @@ IF (WITH_GUI) FILE(GLOB_RECURSE sip_files_gui gui/*.sip gui/*.sip.in) SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_gui}) SET(SIP_EXTRA_OPTIONS ${PYQT_SIP_FLAGS} -g -o -a ${CMAKE_BINARY_DIR}/python/qgis.gui.api) + IF((${SIP_VERSION_STR} VERSION_EQUAL 4.19.11) OR (${SIP_VERSION_STR} VERSION_GREATER 4.19.11)) + SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -n sip) + ENDIF((${SIP_VERSION_STR} VERSION_EQUAL 4.19.11) OR (${SIP_VERSION_STR} VERSION_GREATER 4.19.11)) IF((${SIP_VERSION_STR} VERSION_EQUAL 4.18) OR (${SIP_VERSION_STR} VERSION_GREATER 4.18)) SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -y ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_gui.pyi) ENDIF((${SIP_VERSION_STR} VERSION_EQUAL 4.18) OR (${SIP_VERSION_STR} VERSION_GREATER 4.18)) @@ -219,6 +225,9 @@ IF (WITH_SERVER AND WITH_SERVER_PLUGINS) FILE(GLOB_RECURSE sip_files_server server/*.sip server/*.sip.in) SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_server}) SET(SIP_EXTRA_OPTIONS ${PYQT_SIP_FLAGS} -g -o -a ${CMAKE_BINARY_DIR}/python/qgis.server.api) + IF((${SIP_VERSION_STR} VERSION_EQUAL 4.19.11) OR (${SIP_VERSION_STR} VERSION_GREATER 4.19.11)) + SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -n sip) + ENDIF((${SIP_VERSION_STR} VERSION_EQUAL 4.19.11) OR (${SIP_VERSION_STR} VERSION_GREATER 4.19.11)) IF((${SIP_VERSION_STR} VERSION_EQUAL 4.18) OR (${SIP_VERSION_STR} VERSION_GREATER 4.18)) SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -y ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_server.pyi) ENDIF((${SIP_VERSION_STR} VERSION_EQUAL 4.18) OR (${SIP_VERSION_STR} VERSION_GREATER 4.18)) @@ -246,6 +255,9 @@ INCLUDE_DIRECTORIES(BEFORE FILE(GLOB_RECURSE sip_files_analysis analysis/*.sip analysis/*.sip.in) SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_analysis}) SET(SIP_EXTRA_OPTIONS ${PYQT_SIP_FLAGS} -g -o -a ${CMAKE_BINARY_DIR}/python/qgis.analysis.api) +IF((${SIP_VERSION_STR} VERSION_EQUAL 4.19.11) OR (${SIP_VERSION_STR} VERSION_GREATER 4.19.11)) + SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -n sip) +ENDIF((${SIP_VERSION_STR} VERSION_EQUAL 4.19.11) OR (${SIP_VERSION_STR} VERSION_GREATER 4.19.11)) IF((${SIP_VERSION_STR} VERSION_EQUAL 4.18) OR (${SIP_VERSION_STR} VERSION_GREATER 4.18)) SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -y ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_analysis.pyi) ENDIF((${SIP_VERSION_STR} VERSION_EQUAL 4.18) OR (${SIP_VERSION_STR} VERSION_GREATER 4.18))