mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 16:52:53 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/getopt-win32/vcpkg.json
View File

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

4
ports/getopt/vcpkg.json
View File

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

6
ports/nuspell/fix-tools.patch
View File

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

2
ports/nuspell/vcpkg.json
View File

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

6
versions/baseline.json
View File

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

5
versions/g-/getopt-win32.json
View File

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

5
versions/g-/getopt.json
View File

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

5
versions/n-/nuspell.json
View File

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