Skip to content

Commit 8825f86

Browse files
committed
fix sid build with sip 6.9.1
1 parent 2d70b7a commit 8825f86

File tree

6 files changed

+14
-0
lines changed

6 files changed

+14
-0
lines changed

python/3d/pyproject.toml.in

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
[build-system]
33
requires = ["sip >=5.0.0, <7", "PyQt-builder >=1.6, <2"]
44
build-backend = "sipbuild.api"
5+
@sipabi@
56

67
# Specify the PEP 566 metadata for the project.
78
[tool.sip.metadata]

python/CMakeLists.txt

+9
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,15 @@ if(NOT WITH_QTWEBENGINE)
178178
set(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} HAVE_WEBENGINE_SIP)
179179
endif()
180180

181+
# Deprecated annotation supports message only since version 6.9.0 with abi-version 12.16 / 13.9 and above
182+
if(${SIP_VERSION_STR} VERSION_LESS 6.9.0)
183+
set(sipabi "")
184+
elseif(BUILD_WITH_QT6)
185+
set(sipabi "\n[tool.sip.project]\nabi-version = \"13.9\"")
186+
else()
187+
set(sipabi "\n[tool.sip.project]\nabi-version = \"12.16\"")
188+
endif()
189+
181190
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/core/project.py.in ${CMAKE_CURRENT_BINARY_DIR}/core/project.py @ONLY)
182191
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/core/pyproject.toml.in ${CMAKE_CURRENT_BINARY_DIR}/core/pyproject.toml @ONLY)
183192
GENERATE_SIP_PYTHON_MODULE_CODE(qgis._core core/core.sip "${sip_files_core}" cpp_files)

python/analysis/pyproject.toml.in

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
[build-system]
33
requires = ["sip >=5.0.0, <7", "PyQt-builder >=1.6, <2"]
44
build-backend = "sipbuild.api"
5+
@sipabi@
56

67
# Specify the PEP 566 metadata for the project.
78
[tool.sip.metadata]

python/core/pyproject.toml.in

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
[build-system]
33
requires = ["sip >=5.0.0, <7", "PyQt-builder >=1.6, <2"]
44
build-backend = "sipbuild.api"
5+
@sipabi@
56

67
# Specify the PEP 566 metadata for the project.
78
[tool.sip.metadata]

python/gui/pyproject.toml.in

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
[build-system]
33
requires = ["sip >=5.0.0, <7", "PyQt-builder >=1.6, <2"]
44
build-backend = "sipbuild.api"
5+
@sipabi@
56

67
# Specify the PEP 566 metadata for the project.
78
[tool.sip.metadata]

python/server/pyproject.toml.in

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
[build-system]
33
requires = ["sip >=5.0.0, <7", "PyQt-builder >=1.6, <2"]
44
build-backend = "sipbuild.api"
5+
@sipabi@
56

67
# Specify the PEP 566 metadata for the project.
78
[tool.sip.metadata]

0 commit comments

Comments
 (0)