diff options
| author | Dimitrij Mijoski <dmjpp@hotmail.com> | 2020-11-12 21:42:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-12 12:42:40 -0800 |
| commit | fe4aedef4d5bb3be19226ce4b6741510e2270cc2 (patch) | |
| tree | 65cdfb573184a92d5fa1105b132dfac1f46b380c /ports/nuspell/cmake-disable-cli-and-docs.patch | |
| parent | 4733e26fa827d173c67e780ac154307581688afa (diff) | |
| download | vcpkg-fe4aedef4d5bb3be19226ce4b6741510e2270cc2.tar.gz vcpkg-fe4aedef4d5bb3be19226ce4b6741510e2270cc2.zip | |
[nuspell] Update version to 4.0.1 (#14505)
* [nuspell] Update version to 4.0.1
* [nuspell] Install pkg-config files instead of deleting them.
Diffstat (limited to 'ports/nuspell/cmake-disable-cli-and-docs.patch')
| -rw-r--r-- | ports/nuspell/cmake-disable-cli-and-docs.patch | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/ports/nuspell/cmake-disable-cli-and-docs.patch b/ports/nuspell/cmake-disable-cli-and-docs.patch index fd6f82fac..77d5ff076 100644 --- a/ports/nuspell/cmake-disable-cli-and-docs.patch +++ b/ports/nuspell/cmake-disable-cli-and-docs.patch @@ -1,8 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a498118..161f0f3 100644 +index 835ebfb..82fa335 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -18,8 +18,6 @@ if (subproject) +@@ -8,7 +8,6 @@ include(GNUInstallDirs) + include(CMakePackageConfigHelpers) + + find_package(ICU REQUIRED COMPONENTS uc data) +-find_package(Boost 1.48.0 REQUIRED COMPONENTS locale) + + get_directory_property(subproject PARENT_DIRECTORY) + +@@ -20,8 +19,6 @@ if (subproject) return() endif() @@ -12,24 +20,33 @@ index a498118..161f0f3 100644 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 22894f6..d58ad43 100644 +index a8d215f..78553c5 100644 --- a/src/nuspell/CMakeLists.txt +++ b/src/nuspell/CMakeLists.txt -@@ -23,13 +23,6 @@ target_include_directories(nuspell - target_link_libraries(nuspell - PUBLIC Boost::boost ICU::uc ICU::data) +@@ -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 -- OUTPUT_NAME nuspell) +- RUNTIME_OUTPUT_DIRECTORY ../tools +- RUNTIME_OUTPUT_NAME nuspell) -target_compile_definitions(nuspell-bin PRIVATE - PROJECT_VERSION=\"${PROJECT_VERSION}\") -target_link_libraries(nuspell-bin nuspell Boost::locale) +-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 -@@ -40,5 +33,4 @@ if (NOT subproject) +@@ -53,5 +37,4 @@ if (NOT subproject) install(EXPORT NuspellTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/nuspell NAMESPACE Nuspell::) |