mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 03:10:57 +08:00
[libxml2] Fix ICU support option (#35281)
* Fix ICU support option * update version * [libxml2] Fix ICU support option * format vcpkg.json * update version * Add qtwebengine depend on libxml2[icu] * update version * update version * update feature * update version --------- Co-authored-by: vzhli17 <v-zhli17@microsoft.com>
This commit is contained in:
parent
72f36d7d0c
commit
ca9ac0ba65
@ -19,6 +19,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
"lzma" LIBXML2_WITH_LZMA
|
||||
"zlib" LIBXML2_WITH_ZLIB
|
||||
"tools" LIBXML2_WITH_PROGRAMS
|
||||
"icu" LIBXML2_WITH_ICU
|
||||
)
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
@ -30,7 +31,6 @@ vcpkg_cmake_configure(
|
||||
-DLIBXML2_WITH_CATALOG=ON
|
||||
-DLIBXML2_WITH_DEBUG=ON
|
||||
-DLIBXML2_WITH_ISO8859X=ON
|
||||
-DLIBXML2_WITH_ICU=OFF # Culprit of linkage issues? Solving this is probably another PR
|
||||
-DLIBXML2_WITH_MEM_DEBUG=OFF
|
||||
-DLIBXML2_WITH_MODULES=ON
|
||||
-DLIBXML2_WITH_OUTPUT=ON
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "libxml2",
|
||||
"version": "2.11.6",
|
||||
"port-version": 1,
|
||||
"description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).",
|
||||
"homepage": "https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home",
|
||||
"license": "MIT",
|
||||
@ -34,6 +35,12 @@
|
||||
"libiconv"
|
||||
]
|
||||
},
|
||||
"icu": {
|
||||
"description": "Add ICU support",
|
||||
"dependencies": [
|
||||
"icu"
|
||||
]
|
||||
},
|
||||
"legacy": {
|
||||
"description": "Add deprecated APIs for compatibility"
|
||||
},
|
||||
|
@ -2,6 +2,7 @@
|
||||
"$comment": "x86-windows is not within the upstream support matrix of Qt6",
|
||||
"name": "qtwebengine",
|
||||
"version": "6.6.1",
|
||||
"port-version": 1,
|
||||
"description": "Qt WebEngine",
|
||||
"homepage": "https://www.qt.io/",
|
||||
"license": null,
|
||||
@ -57,6 +58,10 @@
|
||||
},
|
||||
{
|
||||
"name": "libxml2",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"icu"
|
||||
],
|
||||
"platform": "!windows"
|
||||
},
|
||||
{
|
||||
|
@ -5098,7 +5098,7 @@
|
||||
},
|
||||
"libxml2": {
|
||||
"baseline": "2.11.6",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"libxmlmm": {
|
||||
"baseline": "0.6.0",
|
||||
@ -7262,7 +7262,7 @@
|
||||
},
|
||||
"qtwebengine": {
|
||||
"baseline": "6.6.1",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"qtwebsockets": {
|
||||
"baseline": "6.6.1",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "b2fd11805c5e6714215c5dd9630400c4ad32e833",
|
||||
"version": "2.11.6",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "a347ee0ddfd928d4f61ec12b3b95c1c7740d46df",
|
||||
"version": "2.11.6",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "f84af713f1090d7294c2707dc722373c06857114",
|
||||
"version": "6.6.1",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "60b5738d6361d11f4dea17e82df45014ffddd6be",
|
||||
"version": "6.6.1",
|
||||
|
Loading…
x
Reference in New Issue
Block a user