aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbucurb <bobuc@microsoft.com>2021-07-01 17:49:04 +0100
committerGitHub <noreply@github.com>2021-07-01 09:49:04 -0700
commit7338d7ec1a92078cb5f9292f20445914587b6bd9 (patch)
treed7eb0dc455ecd041e50e00244646fbc071e0dc42
parent6d47a2faecfc1b057b18b4b2c2b549384c24a9f9 (diff)
downloadvcpkg-7338d7ec1a92078cb5f9292f20445914587b6bd9.tar.gz
vcpkg-7338d7ec1a92078cb5f9292f20445914587b6bd9.zip
[libxml2] Fix target (#18714)
* fix LibXml2 target dependencies * updated version files
-rw-r--r--ports/libxml2/vcpkg-cmake-wrapper.cmake3
-rw-r--r--ports/libxml2/vcpkg.json2
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/l-/libxml2.json5
4 files changed, 10 insertions, 2 deletions
diff --git a/ports/libxml2/vcpkg-cmake-wrapper.cmake b/ports/libxml2/vcpkg-cmake-wrapper.cmake
index 405b94670..31bab78f7 100644
--- a/ports/libxml2/vcpkg-cmake-wrapper.cmake
+++ b/ports/libxml2/vcpkg-cmake-wrapper.cmake
@@ -12,6 +12,9 @@ if(LibXml2_FOUND)
select_library_configurations(ICONV)
select_library_configurations(CHARSET)
list(APPEND LIBXML2_LIBRARIES ${LIBLZMA_LIBRARIES} ${ZLIB_LIBRARIES})
+ if(TARGET LibXml2::LibXml2)
+ target_link_libraries(LibXml2::LibXml2 INTERFACE "liblzma::liblzma" "ZLIB::ZLIB")
+ endif()
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
list(APPEND LIBXML2_LIBRARIES m)
endif()
diff --git a/ports/libxml2/vcpkg.json b/ports/libxml2/vcpkg.json
index 617e3a4a5..fbcd7b114 100644
--- a/ports/libxml2/vcpkg.json
+++ b/ports/libxml2/vcpkg.json
@@ -1,7 +1,7 @@
{
"name": "libxml2",
"version-semver": "2.9.10",
- "port-version": 7,
+ "port-version": 8,
"description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).",
"homepage": "https://xmlsoft.org/",
"dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 863913d43..dcba84391 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3710,7 +3710,7 @@
},
"libxml2": {
"baseline": "2.9.10",
- "port-version": 7
+ "port-version": 8
},
"libxmlmm": {
"baseline": "0.6.0",
diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json
index 3675ab518..6fe34d800 100644
--- a/versions/l-/libxml2.json
+++ b/versions/l-/libxml2.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "b0cf9aec6fb5cd87ae6358e9015e92e9d113c1f1",
+ "version-semver": "2.9.10",
+ "port-version": 8
+ },
+ {
"git-tree": "f86ba7081b940af77e935875fbdf9cbf69446b9f",
"version-semver": "2.9.10",
"port-version": 7