mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-16 05:39:02 +08:00
f8b9c6ad11
* [qtpositioning] devendor poly2tri * Trim patch
38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
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)
|