diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2021-08-05 11:05:18 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-04 20:05:18 -0700 |
| commit | d2019e507caf9469d8d5c93bfcd3f6d26548ca12 (patch) | |
| tree | 771371e0aec257c4235a205e8df4cd8c4eb7fdd0 | |
| parent | fa43004f0c20e37a2564701d25c5b1226cc91855 (diff) | |
| download | vcpkg-d2019e507caf9469d8d5c93bfcd3f6d26548ca12.tar.gz vcpkg-d2019e507caf9469d8d5c93bfcd3f6d26548ca12.zip | |
[vcpkg baseline][hunspell] Fix usage when building static (#19323)
| -rw-r--r-- | ports/hunspell/portfile.cmake | 13 | ||||
| -rw-r--r-- | ports/hunspell/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/h-/hunspell.json | 5 |
4 files changed, 20 insertions, 2 deletions
diff --git a/ports/hunspell/portfile.cmake b/ports/hunspell/portfile.cmake index bf48b9c2e..053d1dda4 100644 --- a/ports/hunspell/portfile.cmake +++ b/ports/hunspell/portfile.cmake @@ -77,6 +77,19 @@ else() endif() vcpkg_copy_pdbs() +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + if (VCPKG_TARGET_IS_WINDOWS) + 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") diff --git a/ports/hunspell/vcpkg.json b/ports/hunspell/vcpkg.json index 372bac8dc..c89c4ca94 100644 --- a/ports/hunspell/vcpkg.json +++ b/ports/hunspell/vcpkg.json @@ -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)", diff --git a/versions/baseline.json b/versions/baseline.json index e0d2c770f..c6742dd55 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2558,7 +2558,7 @@ }, "hunspell": { "baseline": "1.7.0", - "port-version": 4 + "port-version": 5 }, "hwloc": { "baseline": "2.2.0", diff --git a/versions/h-/hunspell.json b/versions/h-/hunspell.json index 0c6d4ad37..af5756c94 100644 --- a/versions/h-/hunspell.json +++ b/versions/h-/hunspell.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "2a0514dd8b3893b6d3a502fbf55156e9e971d6f7", + "version": "1.7.0", + "port-version": 5 + }, + { "git-tree": "1441675cd83b048c9fe45d9230ab99c06421b121", "version": "1.7.0", "port-version": 4 |