Fix builing nuspell[tools] on Mingw (#24715)

* Fix builing nuspell[tools] on Mingw

* x-add-version

* metadata

* x-add-version
This commit is contained in:
Dimitrij Mijoski 2022-05-18 11:30:36 +02:00 committed by GitHub
parent ab555695dd
commit 261ca0dd4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 27 additions and 12 deletions

View File

@ -1,9 +1,9 @@
{
"name": "getopt-win32",
"version-string": "0.1",
"port-version": 2,
"version": "0.1",
"port-version": 3,
"description": "An implementation of getopt.",
"homepage": "https://github.com/libimobiledevice-win32",
"license": "LGPL-3.0-only",
"supports": "windows"
"supports": "windows & !mingw"
}

View File

@ -1,13 +1,13 @@
{
"name": "getopt",
"version-string": "0",
"port-version": 1,
"port-version": 2,
"description": "The getopt and getopt_long functions automate some of the chore involved in parsing typical unix command line options.",
"supports": "!uwp",
"dependencies": [
{
"name": "getopt-win32",
"platform": "windows"
"platform": "windows & !mingw"
}
]
}

View File

@ -14,16 +14,16 @@ index 7b54c54..7c6f3a3 100644
if (subproject)
# if added as subproject just build Nuspell
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index 3e63610..9be98be 100644
index 3e63610..7597a6d 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -3,6 +3,10 @@ set_target_properties(nuspell-exe PROPERTIES RUNTIME_OUTPUT_NAME nuspell)
target_compile_definitions(nuspell-exe PRIVATE
PROJECT_VERSION=\"${PROJECT_VERSION}\")
target_link_libraries(nuspell-exe Nuspell::nuspell)
+if (WIN32)
+if (WIN32 AND NOT MINGW)
+ find_library(GETOPT_WIN32_LIBRARY getopt)
+ target_link_libraries(nuspell-exe Nuspell::nuspell ${GETOPT_WIN32_LIBRARY})
+ target_link_libraries(nuspell-exe ${GETOPT_WIN32_LIBRARY})
+endif()
if (BUILD_SHARED_LIBS AND WIN32)
# This should be PRE_LINK (or PRE_BUILD), so Vcpkg's POST_BUILD

View File

@ -1,7 +1,7 @@
{
"name": "nuspell",
"version-semver": "5.1.0",
"port-version": 1,
"port-version": 2,
"description": [
"Nuspell is a fast and safe spelling checker software program.",
"It is designed for languages with rich morphology and complex word compounding.",

View File

@ -2478,11 +2478,11 @@
},
"getopt": {
"baseline": "0",
"port-version": 1
"port-version": 2
},
"getopt-win32": {
"baseline": "0.1",
"port-version": 2
"port-version": 3
},
"gettext": {
"baseline": "0.21",
@ -4934,7 +4934,7 @@
},
"nuspell": {
"baseline": "5.1.0",
"port-version": 1
"port-version": 2
},
"nvtt": {
"baseline": "2.1.2",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "97ccee735c01df1356a70d59bc114512f7ab77cc",
"version": "0.1",
"port-version": 3
},
{
"git-tree": "93d03f637c26f2efa154dfd7c3efb02074cf5eda",
"version-string": "0.1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "be2552adc01c2ba30044325925f7348121de5c3d",
"version-string": "0",
"port-version": 2
},
{
"git-tree": "81815a8f433219e332659e07204f90df381a28a7",
"version-string": "0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5719acdfd3465a7bb3dfac85ce2821c56d7c652a",
"version-semver": "5.1.0",
"port-version": 2
},
{
"git-tree": "02475776fc8cc0332efe7e0ea8851872c911de32",
"version-semver": "5.1.0",