diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-07-22 00:40:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-21 15:40:01 -0700 |
| commit | c69096659f49e2b1aca532ea5c2f8c135182519b (patch) | |
| tree | 8f35d66b6d63151d6aa087dde4d6360c964a02ef | |
| parent | d417ae59d6e9aa20d9f812b5deb966645c54687d (diff) | |
| download | vcpkg-c69096659f49e2b1aca532ea5c2f8c135182519b.tar.gz vcpkg-c69096659f49e2b1aca532ea5c2f8c135182519b.zip | |
[libxml2] fix wrapper (#19033)
| -rw-r--r-- | ports/libxml2/vcpkg-cmake-wrapper.cmake | 6 | ||||
| -rw-r--r-- | ports/libxml2/vcpkg.json | 1 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/l-/libxml2.json | 5 |
4 files changed, 10 insertions, 4 deletions
diff --git a/ports/libxml2/vcpkg-cmake-wrapper.cmake b/ports/libxml2/vcpkg-cmake-wrapper.cmake index 0e3ad69e6..6209ea464 100644 --- a/ports/libxml2/vcpkg-cmake-wrapper.cmake +++ b/ports/libxml2/vcpkg-cmake-wrapper.cmake @@ -10,8 +10,8 @@ if(LibXml2_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT ${ARGV0 find_package(LibLZMA)
find_package(ZLIB)
include(SelectLibraryConfigurations)
- find_library(LIBXML2_LIBRARY_RELEASE NAMES xml2 libxml2 xml2s libxml2s xml2d libxml2d xml2sd libxml2sd NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_INSTALLED_DIR}/debug" NO_DEFAULT_PATH)
- find_library(LIBXML2_LIBRARY_DEBUG NAMES xml2 libxml2 xml2s libxml2s NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)
+ find_library(LIBXML2_LIBRARY_DEBUG NAMES xml2 libxml2 xml2s libxml2s xml2d libxml2d xml2sd libxml2sd NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_INSTALLED_DIR}/debug" NO_DEFAULT_PATH)
+ find_library(LIBXML2_LIBRARY_RELEASE NAMES xml2 libxml2 xml2s libxml2s NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)
find_library(ICONV_LIBRARY_DEBUG NAMES iconvd libiconvd iconv libiconv NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_INSTALLED_DIR}/debug" NO_DEFAULT_PATH)
find_library(ICONV_LIBRARY_RELEASE NAMES iconv libiconv NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)
find_library(ICONV_LIBRARY_RELEASE NAMES iconv libiconv NAMES_PER_DIR PATH_SUFFIXES lib)
@@ -46,7 +46,7 @@ if(LibXml2_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT ${ARGV0 if(ICONV_LIBRARIES)
list(APPEND LIBXML2_LIBRARIES ${ICONV_LIBRARIES})
if(TARGET LibXml2::LibXml2)
- target_link_libraries(LibXml2::LibXml2 INTERFACE ${ICONV_LIBRARIES})
+ target_link_libraries(LibXml2::LibXml2 INTERFACE ${ICONV_LIBRARIES})
endif()
endif()
if(CHARSET_LIBRARIES)
diff --git a/ports/libxml2/vcpkg.json b/ports/libxml2/vcpkg.json index b19b12779..bb9b73883 100644 --- a/ports/libxml2/vcpkg.json +++ b/ports/libxml2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libxml2", "version-semver": "2.9.12", + "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://xmlsoft.org/", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 4652e9339..39b7e720d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3734,7 +3734,7 @@ }, "libxml2": { "baseline": "2.9.12", - "port-version": 0 + "port-version": 1 }, "libxmlmm": { "baseline": "0.6.0", diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index 3b5409d25..d88953a5a 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "a68bece41619060ca2e212b916dcc60c65ca3603", + "version-semver": "2.9.12", + "port-version": 1 + }, + { "git-tree": "c6fe9f85f9c0a1f9349de95425b786cf6462314c", "version-semver": "2.9.12", "port-version": 0 |