fix sid build with sip 6.9.1

qgis · Dec 22, 2024 · 19f8040 · 19f8040
1 parent 0b60e0f
commit 19f8040
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 0 deletions.
diff --git a/cmake/SIPMacros.cmake b/cmake/SIPMacros.cmake
@@ -62,6 +62,16 @@ MACRO(GENERATE_SIP_PYTHON_MODULE_CODE MODULE_NAME MODULE_SIP SIP_FILES CPP_FILES
     GET_FILENAME_COMPONENT(_sip_file_name_we ${_sip_file} NAME_WE)
     FILE(RELATIVE_PATH _sip_file_relpath ${BINDING_FILES_ROOT_DIR} "${_sip_file_path}/${_sip_file_name_we}")
     SET(_out_sip_file "${CMAKE_CURRENT_BINARY_DIR}/${_sip_file_relpath}.sip")
+
+    # Deprecated annotation supports message only since version 6.9.0 with abi-version 12.16 / 13.9 and above
+    if(${SIP_VERSION_STR} VERSION_LESS 6.9.0)
+	SET(sipabi "")
+    elif(BUILD_WITH_QT6)
+        SET(sipabi "\n[tool.sip.project]\nabi-version = \"13.9\"")
+    else(BUILD_WITH_QT6)
+        SET(sipabi "\n[tool.sip.project]\nabi-version = \"12.16\"")
+    endif()
+
     CONFIGURE_FILE(${_sip_file} ${_out_sip_file})
 
     # Deprecated annotation supports message only since version 6.9.0

diff --git a/python/3d/pyproject.toml.in b/python/3d/pyproject.toml.in
@@ -2,6 +2,7 @@
 [build-system]
 requires = ["sip >=5.0.0, <7", "PyQt-builder >=1.6, <2"]
 build-backend = "sipbuild.api"
+@sipabi@
 
 # Specify the PEP 566 metadata for the project.
 [tool.sip.metadata]

diff --git a/python/analysis/pyproject.toml.in b/python/analysis/pyproject.toml.in
@@ -2,6 +2,7 @@
 [build-system]
 requires = ["sip >=5.0.0, <7", "PyQt-builder >=1.6, <2"]
 build-backend = "sipbuild.api"
+@sipabi@
 
 # Specify the PEP 566 metadata for the project.
 [tool.sip.metadata]

diff --git a/python/core/pyproject.toml.in b/python/core/pyproject.toml.in
@@ -2,6 +2,7 @@
 [build-system]
 requires = ["sip >=5.0.0, <7", "PyQt-builder >=1.6, <2"]
 build-backend = "sipbuild.api"
+@sipabi@
 
 # Specify the PEP 566 metadata for the project.
 [tool.sip.metadata]

diff --git a/python/gui/pyproject.toml.in b/python/gui/pyproject.toml.in
@@ -2,6 +2,7 @@
 [build-system]
 requires = ["sip >=5.0.0, <7", "PyQt-builder >=1.6, <2"]
 build-backend = "sipbuild.api"
+@sipabi@
 
 # Specify the PEP 566 metadata for the project.
 [tool.sip.metadata]

diff --git a/python/server/pyproject.toml.in b/python/server/pyproject.toml.in
@@ -2,6 +2,7 @@
 [build-system]
 requires = ["sip >=5.0.0, <7", "PyQt-builder >=1.6, <2"]
 build-backend = "sipbuild.api"
+@sipabi@
 
 # Specify the PEP 566 metadata for the project.
 [tool.sip.metadata]