Skip to content

[vcpkg baseline][hunspell] Fix usage when building static #19323

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.

Sign up for GitHub

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

Merged
BillyONeal merged 4 commits into from
Aug 5, 2021
Merged

[vcpkg baseline][hunspell] Fix usage when building static #19323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99a45f1
[hunspell] Fix usage when building static
Aug 3, 2021
ab3e6bd
version
Aug 3, 2021
1c2d38f
Fix header path
Aug 4, 2021
ff41ddd
Update versions/h-/hunspell.json
JackBoosY Aug 4, 2021
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
13 changes: 13 additions & 0 deletions ports/hunspell/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,19 @@ else()
endif()
vcpkg_copy_pdbs()

if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
if (VCPKG_TARGET_IS_WINDOWS)
Copy link
Contributor

@dg0yt dg0yt Aug 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs a AND NOT VCPKG_TARGET_IS_MINGW, to match the earlier choice of build system. I just verified that mingw installs to include/hunspell/hunvisapi.h.

set(HUNSPELL_EXPORT_HDR "${CURRENT_PACKAGES_DIR}/include/hunvisapi.h")
else()
set(HUNSPELL_EXPORT_HDR "${CURRENT_PACKAGES_DIR}/include/hunspell/hunvisapi.h")
endif()
vcpkg_replace_string(
${HUNSPELL_EXPORT_HDR}
"#if defined(HUNSPELL_STATIC)"
"#if 1"
)
endif()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

Expand Down
2 changes: 1 addition & 1 deletion ports/hunspell/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "hunspell",
"version": "1.7.0",
"port-version": 4,
"port-version": 5,
"description": "The most popular spellchecking library.",
"homepage": "https://github.com/hunspell/hunspell",
"supports": "!((arm | uwp) & windows)",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2546,7 +2546,7 @@
},
"hunspell": {
"baseline": "1.7.0",
"port-version": 4
"port-version": 5
},
"hwloc": {
"baseline": "2.2.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/h-/hunspell.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2a0514dd8b3893b6d3a502fbf55156e9e971d6f7",
"version": "1.7.0",
"port-version": 5
},
{
"git-tree": "1441675cd83b048c9fe45d9230ab99c06421b121",
"version": "1.7.0",
Expand Down