Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 11 commits into from
Jan 4, 2023
Merged

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

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f828c23
[vcpkg baseline][marisa-trie] Fix conflict file include/Makefile.am w…
LilyWangLL Dec 15, 2022
076921c
x-add-version
LilyWangLL Dec 15, 2022
cb0c97b
update vcpkg_install_msbuild.cmake
LilyWangLL Dec 16, 2022
34f4d16
x-add-version
LilyWangLL Dec 16, 2022
c97d5cf
update vcpkg_install_msbuild.cmake
LilyWangLL Dec 16, 2022
7bb8106
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
LilyWangLL Dec 19, 2022
c139413
update vcpkg_install_msbuild.cmake
LilyWangLL Dec 19, 2022
8d309c2
Merge branch 'dev/LilyWang/CI_1215_marisa' of https://github.com/Lily…
LilyWangLL Dec 19, 2022
7774376
update vcpkg_install_msbuild.cmake
LilyWangLL Dec 19, 2022
a8c35f6
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
JonLiu1993 Dec 21, 2022
43cf1de
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
LilyWangLL Dec 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ports/marisa-trie/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ports/marisa-trie/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
8 changes: 8 additions & 0 deletions scripts/cmake/vcpkg_install_msbuild.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/*")
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4762,7 +4762,7 @@
},
"marisa-trie": {
"baseline": "0.2.6+20200926",
"port-version": 0
"port-version": 1
},
"marl": {
"baseline": "2022-03-02",
Expand Down
5 changes: 5 additions & 0 deletions versions/m-/marisa-trie.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "35722f742acbc4cb5e0ce48eccf06830ca2cf2ba",
"version": "0.2.6+20200926",
"port-version": 1
},
{
"git-tree": "aec2055269a2ed80494b6cc8876c48787b65d265",
"version": "0.2.6+20200926",
Expand Down