Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[vcpkg baseline][marisa-trie] Fix conflict file include/Makefile.am with hunspell (#28352) 

* [vcpkg baseline][marisa-trie] Fix conflict file include/Makefile.am with hunspell

* x-add-version

* update vcpkg_install_msbuild.cmake

* x-add-version

* update vcpkg_install_msbuild.cmake

* update vcpkg_install_msbuild.cmake

* update vcpkg_install_msbuild.cmake

Co-authored-by: Jonliu1993 <13720414433@163.com>
This commit is contained in:
Lily Wang 2023-01-04 12:11:05 -08:00 committed by GitHub
parent dd71e22fd2
commit 9033fcdf28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/marisa-trie/portfile.cmake
View File

@ -2,6 +2,10 @@ if (VCPKG_TARGET_IS_WINDOWS)
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
endif()
if(VCPKG_TARGET_IS_LINUX)
message(WARNING "${PORT} currently requires the following packages:\n libtool\n This can be installed on Ubuntu systems via\n sudo apt-get install -y libtool\n")
endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO s-yata/marisa-trie

1
ports/marisa-trie/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "marisa-trie",
"version": "0.2.6+20200926",
"port-version": 1,
"description": "Matching Algorithm with Recursively Implemented StorAge (MARISA) is a space-efficient trie data structure. This is a C++ library for an implementation of MARISA.",
"homepage": "https://github.com/s-yata/marisa-trie",
"license": "BSD-2-Clause OR LGPL-2.1-or-later",

8
scripts/cmake/vcpkg_install_msbuild.cmake
View File

@ -133,6 +133,14 @@ function(vcpkg_install_msbuild)
file(COPY "${arg_SOURCE_PATH}/${arg_INCLUDES_SUBPATH}/"
DESTINATION "${CURRENT_PACKAGES_DIR}/include/"
)
file(GLOB_RECURSE all_am_file "${CURRENT_PACKAGES_DIR}/include/*.am")
file(GLOB_RECURSE all_in_file "${CURRENT_PACKAGES_DIR}/include/*.in")
if(NOT "${all_am_file}" STREQUAL "")
file(REMOVE ${all_am_file})
endif()
if(NOT "${all_in_file}" STREQUAL "")
file(REMOVE ${all_in_file})
endif()
file(GLOB root_includes
LIST_DIRECTORIES false
"${CURRENT_PACKAGES_DIR}/include/*")

2
versions/baseline.json
View File

@ -4782,7 +4782,7 @@
},
"marisa-trie": {
"baseline": "0.2.6+20200926",
"port-version": 0
"port-version": 1
},
"marl": {
"baseline": "2022-03-02",

5
versions/m-/marisa-trie.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "35722f742acbc4cb5e0ce48eccf06830ca2cf2ba",
"version": "0.2.6+20200926",
"port-version": 1
},
{
"git-tree": "aec2055269a2ed80494b6cc8876c48787b65d265",
"version": "0.2.6+20200926",