Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[xerces-c] fix library name in pkg-config file under windows #23535

Merged
merged 2 commits into from
Mar 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion ports/xerces-c/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ configure_file(
${CURRENT_PACKAGES_DIR}/share/xercesc
@ONLY
)

file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/share"
Expand All @@ -66,3 +66,13 @@ file(REMOVE_RECURSE
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

vcpkg_fixup_pkgconfig()
if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
set(pc_file_release "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/xerces-c.pc")
set(pc_file_debug "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/xerces-c.pc")
if(EXISTS "${pc_file_release}")
vcpkg_replace_string("${pc_file_release}" "-lxerces-c" "-lxerces-c_3")
endif()
if(EXISTS "${pc_file_debug}")
vcpkg_replace_string("${pc_file_debug}" "-lxerces-c" "-lxerces-c_3D")
endif()
endif()
5 changes: 3 additions & 2 deletions ports/xerces-c/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"name": "xerces-c",
"version-string": "3.2.3",
"port-version": 3,
"version": "3.2.3",
"port-version": 4,
"description": "Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs.",
"homepage": "https://github.com/apache/xerces-c",
"license": "Apache-2.0",
"features": {
"icu": {
"description": "ICU support",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -7446,7 +7446,7 @@
},
"xerces-c": {
"baseline": "3.2.3",
"port-version": 3
"port-version": 4
},
"xeus": {
"baseline": "0.24.3",
Expand Down
5 changes: 5 additions & 0 deletions versions/x-/xerces-c.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6e0b3743b100fd4c22291b3c55ff73aac8ae188c",
"version": "3.2.3",
"port-version": 4
},
{
"git-tree": "b920ebcb559e728e512c42e7e27ce5db58aba440",
"version-string": "3.2.3",
Expand Down