[qtpositioning] devendor poly2tri (#31462)

* [qtpositioning] devendor poly2tri

* Trim patch
This commit is contained in:
Matthias Kuhn 2023-05-22 03:01:48 +02:00 committed by GitHub
parent f632b00a3f
commit f8b9c6ad11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 48 additions and 1 deletions

View File

@ -0,0 +1,37 @@
diff --color -Naur a/src/3rdparty/clip2tri/CMakeLists.txt b/src/3rdparty/clip2tri/CMakeLists.txt
--- a/src/3rdparty/clip2tri/CMakeLists.txt 2023-05-13 16:59:42.377052155 +0200
+++ b/src/3rdparty/clip2tri/CMakeLists.txt 2023-05-13 23:05:44.950379088 +0200
@@ -4,6 +4,7 @@
## Bundled_Clip2Tri Generic Library:
#####################################################################
+find_package(poly2tri)
qt_internal_add_3rdparty_library(Bundled_Clip2Tri
QMAKE_LIB_NAME _clip2tri
STATIC
@@ -13,11 +14,12 @@
clip2tri.cpp clip2tri.h
INCLUDE_DIRECTORIES
../clipper
- ../poly2tri
LIBRARIES
Qt::Bundled_Clipper # special case
- Qt::Bundled_Poly2Tri # special case
+ poly2tri::poly2tri
)
+target_link_libraries(Bundled_Clip2Tri PRIVATE poly2tri::poly2tri)
+set_target_properties(poly2tri::poly2tri PROPERTIES INTERFACE_QT_PACKAGE_NAME poly2tri)
qt_disable_warnings(Bundled_Clip2Tri)
qt_set_symbol_visibility_hidden(Bundled_Clip2Tri)
diff --color -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt 2023-05-13 16:59:42.379052157 +0200
+++ b/src/CMakeLists.txt 2023-05-13 17:00:19.256085781 +0200
@@ -2,7 +2,6 @@
# SPDX-License-Identifier: BSD-3-Clause
# special case begin
-add_subdirectory(3rdparty/poly2tri)
add_subdirectory(3rdparty/clipper)
add_subdirectory(3rdparty/clip2tri)
add_subdirectory(positioning)

View File

@ -1,6 +1,9 @@
set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
include("${SCRIPT_PATH}/qt_install_submodule.cmake")
set(${PORT}_PATCHES
devendor-poly2tri.patch)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
"qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick

View File

@ -1,10 +1,12 @@
{
"name": "qtpositioning",
"version": "6.5.0",
"port-version": 1,
"description": "Qt Positioning",
"homepage": "https://www.qt.io/",
"license": null,
"dependencies": [
"poly2tri",
{
"name": "qtbase",
"default-features": false

View File

@ -6782,7 +6782,7 @@
},
"qtpositioning": {
"baseline": "6.5.0",
"port-version": 0
"port-version": 1
},
"qtquick3d": {
"baseline": "6.5.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "440f18e3ab2e18be1de9550ed16ddb7164c5b826",
"version": "6.5.0",
"port-version": 1
},
{
"git-tree": "0da142e2b032f345e88aed41ef444684523be056",
"version": "6.5.0",