Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

Merge a7b67d7207 into 04a9d8e521

This commit is contained in:
tartanpaint 2026-09-04 10:49:21 +00:00 committed by GitHub
parent 04a9d8e521 a7b67d7207
commit d1ba85b3e5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ports/expat/portfile.cmake
View File

@ -4,13 +4,10 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libexpat/libexpat
REF "${REF}"
SHA512 547fe1a3183f75edd23e925ab4151ef7a3afa5f65329784456374d733d54f04e744257239868d4a6c1a21e17edcc3c1eced7b1ed9885cec42006444323fd47e5
SHA512 72e9ad42a11d64c73f4cd4569115e75790ee7d73c850a1ac00ed453418bb782266e180cc06c2ba0ff205d97ea18d5fa2b23247a8b23ed5cb6edb86e28b94e501
HEAD_REF master
)
# Avoid conflicting utf-8 flags for MSVC
vcpkg_replace_string("${SOURCE_PATH}/expat/CMakeLists.txt" "/source-charset:utf-8" "")
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" EXPAT_LINKAGE)
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" EXPAT_CRT_LINKAGE)

54
ports/expat/vcpkg-cmake-wrapper.cmake
View File

@ -1,27 +1,27 @@
include(SelectLibraryConfigurations)
set(EXPATNAMES expat expatw libexpat libexpatw)
set(DEBUGNAMES)
foreach(_CRT "" MT MD)
foreach(name IN LISTS EXPATNAMES)
list(APPEND EXPATNAMES ${name}${_CRT})
list(APPEND DEBUGNAMES ${name}d${_CRT})
endforeach()
endforeach()
find_library(EXPAT_LIBRARY_DEBUG NAMES ${DEBUGNAMES} ${EXPATNAMES} NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH)
find_library(EXPAT_LIBRARY_RELEASE NAMES ${EXPATNAMES} NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)
select_library_configurations(EXPAT)
set(EXPAT_LIBRARY "${EXPAT_LIBRARIES}" CACHE STRING "" FORCE)
_find_package(${ARGS})
if(EXPAT_FOUND AND TARGET EXPAT::EXPAT)
if(EXPAT_LIBRARY_DEBUG)
set_target_properties(EXPAT::EXPAT PROPERTIES IMPORTED_LOCATION_DEBUG "${EXPAT_LIBRARY_DEBUG}")
endif()
if(EXPAT_LIBRARY_RELEASE)
set_target_properties(EXPAT::EXPAT PROPERTIES IMPORTED_LOCATION_RELEASE "${EXPAT_LIBRARY_RELEASE}")
endif()
endif()
unset(EXPATNAMES)
unset(DEBUGNAMES)
include(SelectLibraryConfigurations)
set(EXPATNAMES expat expatw libexpat libexpatw)
set(DEBUGNAMES)
foreach(_CRT "" MT MD)
foreach(name IN LISTS EXPATNAMES)
list(APPEND EXPATNAMES ${name}${_CRT})
list(APPEND DEBUGNAMES ${name}d${_CRT})
endforeach()
endforeach()
find_library(EXPAT_LIBRARY_DEBUG NAMES ${DEBUGNAMES} ${EXPATNAMES} NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH)
find_library(EXPAT_LIBRARY_RELEASE NAMES ${EXPATNAMES} NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)
select_library_configurations(EXPAT)
set(EXPAT_LIBRARY "${EXPAT_LIBRARIES}" CACHE STRING "" FORCE)
_find_package(${ARGS})
if(EXPAT_FOUND AND TARGET EXPAT::EXPAT)
if(EXPAT_LIBRARY_DEBUG)
set_target_properties(EXPAT::EXPAT PROPERTIES IMPORTED_LOCATION_DEBUG "${EXPAT_LIBRARY_DEBUG}")
endif()
if(EXPAT_LIBRARY_RELEASE)
set_target_properties(EXPAT::EXPAT PROPERTIES IMPORTED_LOCATION_RELEASE "${EXPAT_LIBRARY_RELEASE}")
endif()
endif()
unset(EXPATNAMES)
unset(DEBUGNAMES)

2
ports/expat/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "expat",
"version": "2.8.3",
"version": "2.8.4",
"description": "XML parser library written in C",
"homepage": "https://github.com/libexpat/libexpat",
"license": "MIT",

2
versions/baseline.json
View File

@ -2909,7 +2909,7 @@
"port-version": 0
},
"expat": {
"baseline": "2.8.3",
"baseline": "2.8.4",
"port-version": 0
},
"expected-lite": {

5
versions/e-/expat.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a03bc491c5eae93fd683b90de4b02b70f810d3f4",
"version": "2.8.4",
"port-version": 0
},
{
"git-tree": "aaa1614b66f176bd426d1fab95ae31b3b5fa25bf",
"version": "2.8.3",