mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-28 08:04:39 +08:00
[nuspell] Update to version 5.0.0 (#18590)
* [nuspell] Update to version 5.0.0 * x-add-version nuspell
This commit is contained in:
parent
123211757a
commit
b011e65517
@ -1,7 +0,0 @@
|
|||||||
Source: nuspell
|
|
||||||
Version: 4.2.0
|
|
||||||
Description: Nuspell is a fast and safe spelling checker software program.
|
|
||||||
It is designed for languages with rich morphology and complex word compounding.
|
|
||||||
Nuspell is written in modern C++ and it supports Hunspell dictionaries.
|
|
||||||
Homepage: https://nuspell.github.io/
|
|
||||||
Build-Depends: icu
|
|
@ -1,46 +0,0 @@
|
|||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index a98ed58..3756bae 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -19,8 +19,6 @@ if (subproject)
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
-add_subdirectory(docs)
|
|
||||||
-
|
|
||||||
function(find_catch2_from_source)
|
|
||||||
set(Catch2_FOUND Catch2-NOTFOUND PARENT_SCOPE)
|
|
||||||
set(catch_cmake_lists ${PROJECT_SOURCE_DIR}/external/Catch2/CMakeLists.txt)
|
|
||||||
diff --git a/src/nuspell/CMakeLists.txt b/src/nuspell/CMakeLists.txt
|
|
||||||
index 9535686..78553c5 100644
|
|
||||||
--- a/src/nuspell/CMakeLists.txt
|
|
||||||
+++ b/src/nuspell/CMakeLists.txt
|
|
||||||
@@ -27,22 +27,6 @@ target_include_directories(nuspell
|
|
||||||
|
|
||||||
target_link_libraries(nuspell PUBLIC ICU::uc ICU::data)
|
|
||||||
|
|
||||||
-add_executable(nuspell-bin main.cxx)
|
|
||||||
-set_target_properties(nuspell-bin PROPERTIES
|
|
||||||
- RUNTIME_OUTPUT_DIRECTORY ../tools
|
|
||||||
- RUNTIME_OUTPUT_NAME nuspell)
|
|
||||||
-target_compile_definitions(nuspell-bin PRIVATE
|
|
||||||
- PROJECT_VERSION=\"${PROJECT_VERSION}\")
|
|
||||||
-target_link_libraries(nuspell-bin nuspell)
|
|
||||||
-if (BUILD_SHARED_LIBS AND WIN32)
|
|
||||||
- # This should be PRE_LINK (or PRE_BUILD), so Vcpkg's POST_BUILD
|
|
||||||
- # step (see VCPKG_APPLOCAL_DEPS) that copies dll can pick up nuspell.dll
|
|
||||||
- # inside the folder ../tools.
|
|
||||||
- add_custom_command(TARGET nuspell-bin PRE_LINK
|
|
||||||
- COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
|
||||||
- $<TARGET_FILE:nuspell> $<TARGET_FILE_DIR:nuspell-bin>)
|
|
||||||
-endif()
|
|
||||||
-
|
|
||||||
if (NOT subproject)
|
|
||||||
install(TARGETS nuspell
|
|
||||||
EXPORT NuspellTargets
|
|
||||||
@@ -53,5 +37,4 @@ if (NOT subproject)
|
|
||||||
install(EXPORT NuspellTargets
|
|
||||||
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/nuspell
|
|
||||||
NAMESPACE Nuspell::)
|
|
||||||
- install(TARGETS nuspell-bin DESTINATION ${CMAKE_INSTALL_BINDIR})
|
|
||||||
endif()
|
|
@ -1,15 +1,9 @@
|
|||||||
vcpkg_from_github(
|
vcpkg_from_github(
|
||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
REPO nuspell/nuspell
|
REPO nuspell/nuspell
|
||||||
REF v4.2.0
|
REF v5.0.0
|
||||||
SHA512 ae9157e9753868c002ed69a765fb705d29d993f3940e11efbc2699778a8b1abee2eb7daa0ff51187b899d6935a215a24662e5b52ec1ef5c644e90a0245f7583d
|
SHA512 92605c5f0d413b86711fea3b993d656552d5e72440303d3e71907a503d060ead032dfeb0dd8dbb790f35599b8cca8854bdd8650f0560793d9c62a11aebccc2e5
|
||||||
HEAD_REF master
|
HEAD_REF master
|
||||||
PATCHES cmake-disable-cli-and-docs.patch
|
|
||||||
# This patch disables building the CLI tool and leaves only the library.
|
|
||||||
# That is because Vcpkg complains when it finds .exe files in the folder
|
|
||||||
# "bin". Instead it expects them under "tools", which is different
|
|
||||||
# convention than on Unixes. This patch is quick fix, the CLI is not
|
|
||||||
# that important.
|
|
||||||
)
|
)
|
||||||
vcpkg_configure_cmake(
|
vcpkg_configure_cmake(
|
||||||
SOURCE_PATH ${SOURCE_PATH}
|
SOURCE_PATH ${SOURCE_PATH}
|
||||||
@ -24,6 +18,7 @@ vcpkg_fixup_pkgconfig(
|
|||||||
# because it can't find this. -lm is part of glibc on Linux.
|
# because it can't find this. -lm is part of glibc on Linux.
|
||||||
SYSTEM_LIBRARIES m
|
SYSTEM_LIBRARIES m
|
||||||
)
|
)
|
||||||
|
vcpkg_copy_tools(TOOL_NAMES nuspell AUTO_CLEAN)
|
||||||
file(REMOVE_RECURSE
|
file(REMOVE_RECURSE
|
||||||
${CURRENT_PACKAGES_DIR}/debug/include
|
${CURRENT_PACKAGES_DIR}/debug/include
|
||||||
${CURRENT_PACKAGES_DIR}/debug/share
|
${CURRENT_PACKAGES_DIR}/debug/share
|
||||||
|
13
ports/nuspell/vcpkg.json
Normal file
13
ports/nuspell/vcpkg.json
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
{
|
||||||
|
"name": "nuspell",
|
||||||
|
"version-semver": "5.0.0",
|
||||||
|
"description": [
|
||||||
|
"Nuspell is a fast and safe spelling checker software program.",
|
||||||
|
"It is designed for languages with rich morphology and complex word compounding.",
|
||||||
|
"Nuspell is written in modern C++ and it supports Hunspell dictionaries."
|
||||||
|
],
|
||||||
|
"homepage": "https://nuspell.github.io/",
|
||||||
|
"dependencies": [
|
||||||
|
"icu"
|
||||||
|
]
|
||||||
|
}
|
@ -4377,7 +4377,7 @@
|
|||||||
"port-version": 0
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"nuspell": {
|
"nuspell": {
|
||||||
"baseline": "4.2.0",
|
"baseline": "5.0.0",
|
||||||
"port-version": 0
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"nvtt": {
|
"nvtt": {
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "80e078d3797fd83a92fd3a6d0f59a373e43beadb",
|
||||||
|
"version-semver": "5.0.0",
|
||||||
|
"port-version": 0
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "97027ba299650a7ef96081bf3a466ac76108593f",
|
"git-tree": "97027ba299650a7ef96081bf3a466ac76108593f",
|
||||||
"version-string": "4.2.0",
|
"version-string": "4.2.0",
|
||||||
|
Loading…
Reference in New Issue
Block a user