mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 22:01:37 +08:00
[marisa-trie] Don't install Makefile.am into include. Also remove tests. (#28940)
* [marisa-trie] Don't install Makefile.am into include. Also remove tests. * Fix version database
This commit is contained in:
Billy O'Neal
GitHub
parent
6b9c9a42f6
commit
21928dcd82
@ -12,17 +12,25 @@ vcpkg_from_github(
|
||||
REF 006020c1df76d0d7dc6118dacc22da64da2e35c4
|
||||
SHA512 05dd7cc81a6347d4528654c19617af16de8d7352ad9e38d5f1cd296d88527377ecbfed9dbe722362d64369cd792d1ae0410319854b546ce0b6081ac560a40c0f
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
remove-windows-tests.patch
|
||||
)
|
||||
|
||||
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
|
||||
vcpkg_install_msbuild(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
PROJECT_SUBPATH vs2019/vs2019.sln
|
||||
INCLUDES_SUBPATH include
|
||||
PROJECT_SUBPATH "vs2019/vs2019.sln"
|
||||
LICENSE_SUBPATH COPYING.md
|
||||
PLATFORM ${TRIPLET_SYSTEM_ARCH}
|
||||
PLATFORM "${TRIPLET_SYSTEM_ARCH}"
|
||||
ALLOW_ROOT_INCLUDES
|
||||
)
|
||||
|
||||
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include")
|
||||
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include/marisa")
|
||||
file(INSTALL "${SOURCE_PATH}/include/marisa.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
|
||||
file(GLOB MARISA_DIR_HEADERS "${SOURCE_PATH}/include/marisa/*.h")
|
||||
file(INSTALL ${MARISA_DIR_HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include/marisa")
|
||||
|
||||
vcpkg_clean_msbuild()
|
||||
set(prefix "${CURRENT_INSTALLED_DIR}")
|
||||
set(exec_prefix "\${prefix}")
|
||||
|
||||
68
ports/marisa-trie/remove-windows-tests.patch
Normal file
68
ports/marisa-trie/remove-windows-tests.patch
Normal file
@ -0,0 +1,68 @@
|
||||
diff --git a/vs2019/vs2019.sln b/vs2019/vs2019.sln
|
||||
index df0ecfd..4382416 100644
|
||||
--- a/vs2019/vs2019.sln
|
||||
+++ b/vs2019/vs2019.sln
|
||||
@@ -5,16 +5,6 @@ VisualStudioVersion = 16.0.29519.87
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmarisa", "libmarisa\libmarisa.vcxproj", "{84009DAF-7FAF-44AC-A6AA-023EF63E3051}"
|
||||
EndProject
|
||||
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base-test", "base-test\base-test.vcxproj", "{9C0CFD54-C5A7-4736-9063-7DCB085B2877}"
|
||||
-EndProject
|
||||
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "marisa-test", "marisa-test\marisa-test.vcxproj", "{53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}"
|
||||
-EndProject
|
||||
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "io-test", "io-test\io-test.vcxproj", "{F9C6E136-FE11-4F7E-A113-7A98AACDABC7}"
|
||||
-EndProject
|
||||
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "trie-test", "trie-test\trie-test.vcxproj", "{1654861A-6F01-4D7C-830B-A39678093E4C}"
|
||||
-EndProject
|
||||
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vector-test", "vector-test\vector-test.vcxproj", "{8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}"
|
||||
-EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "marisa-benchmark", "marisa-benchmark\marisa-benchmark.vcxproj", "{CCD0AA2B-1461-4937-B3AD-487E541425FD}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "marisa-build", "marisa-build\marisa-build.vcxproj", "{3F2BDA56-422C-45F9-B2BC-5C19790E0D9D}"
|
||||
@@ -45,46 +35,6 @@ Global
|
||||
{84009DAF-7FAF-44AC-A6AA-023EF63E3051}.Release|x64.Build.0 = Release|x64
|
||||
{84009DAF-7FAF-44AC-A6AA-023EF63E3051}.Release|x86.ActiveCfg = Release|Win32
|
||||
{84009DAF-7FAF-44AC-A6AA-023EF63E3051}.Release|x86.Build.0 = Release|Win32
|
||||
- {9C0CFD54-C5A7-4736-9063-7DCB085B2877}.Debug|x64.ActiveCfg = Debug|x64
|
||||
- {9C0CFD54-C5A7-4736-9063-7DCB085B2877}.Debug|x64.Build.0 = Debug|x64
|
||||
- {9C0CFD54-C5A7-4736-9063-7DCB085B2877}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
- {9C0CFD54-C5A7-4736-9063-7DCB085B2877}.Debug|x86.Build.0 = Debug|Win32
|
||||
- {9C0CFD54-C5A7-4736-9063-7DCB085B2877}.Release|x64.ActiveCfg = Release|x64
|
||||
- {9C0CFD54-C5A7-4736-9063-7DCB085B2877}.Release|x64.Build.0 = Release|x64
|
||||
- {9C0CFD54-C5A7-4736-9063-7DCB085B2877}.Release|x86.ActiveCfg = Release|Win32
|
||||
- {9C0CFD54-C5A7-4736-9063-7DCB085B2877}.Release|x86.Build.0 = Release|Win32
|
||||
- {53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}.Debug|x64.ActiveCfg = Debug|x64
|
||||
- {53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}.Debug|x64.Build.0 = Debug|x64
|
||||
- {53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
- {53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}.Debug|x86.Build.0 = Debug|Win32
|
||||
- {53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}.Release|x64.ActiveCfg = Release|x64
|
||||
- {53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}.Release|x64.Build.0 = Release|x64
|
||||
- {53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}.Release|x86.ActiveCfg = Release|Win32
|
||||
- {53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}.Release|x86.Build.0 = Release|Win32
|
||||
- {F9C6E136-FE11-4F7E-A113-7A98AACDABC7}.Debug|x64.ActiveCfg = Debug|x64
|
||||
- {F9C6E136-FE11-4F7E-A113-7A98AACDABC7}.Debug|x64.Build.0 = Debug|x64
|
||||
- {F9C6E136-FE11-4F7E-A113-7A98AACDABC7}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
- {F9C6E136-FE11-4F7E-A113-7A98AACDABC7}.Debug|x86.Build.0 = Debug|Win32
|
||||
- {F9C6E136-FE11-4F7E-A113-7A98AACDABC7}.Release|x64.ActiveCfg = Release|x64
|
||||
- {F9C6E136-FE11-4F7E-A113-7A98AACDABC7}.Release|x64.Build.0 = Release|x64
|
||||
- {F9C6E136-FE11-4F7E-A113-7A98AACDABC7}.Release|x86.ActiveCfg = Release|Win32
|
||||
- {F9C6E136-FE11-4F7E-A113-7A98AACDABC7}.Release|x86.Build.0 = Release|Win32
|
||||
- {1654861A-6F01-4D7C-830B-A39678093E4C}.Debug|x64.ActiveCfg = Debug|x64
|
||||
- {1654861A-6F01-4D7C-830B-A39678093E4C}.Debug|x64.Build.0 = Debug|x64
|
||||
- {1654861A-6F01-4D7C-830B-A39678093E4C}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
- {1654861A-6F01-4D7C-830B-A39678093E4C}.Debug|x86.Build.0 = Debug|Win32
|
||||
- {1654861A-6F01-4D7C-830B-A39678093E4C}.Release|x64.ActiveCfg = Release|x64
|
||||
- {1654861A-6F01-4D7C-830B-A39678093E4C}.Release|x64.Build.0 = Release|x64
|
||||
- {1654861A-6F01-4D7C-830B-A39678093E4C}.Release|x86.ActiveCfg = Release|Win32
|
||||
- {1654861A-6F01-4D7C-830B-A39678093E4C}.Release|x86.Build.0 = Release|Win32
|
||||
- {8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}.Debug|x64.ActiveCfg = Debug|x64
|
||||
- {8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}.Debug|x64.Build.0 = Debug|x64
|
||||
- {8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
- {8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}.Debug|x86.Build.0 = Debug|Win32
|
||||
- {8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}.Release|x64.ActiveCfg = Release|x64
|
||||
- {8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}.Release|x64.Build.0 = Release|x64
|
||||
- {8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}.Release|x86.ActiveCfg = Release|Win32
|
||||
- {8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}.Release|x86.Build.0 = Release|Win32
|
||||
{CCD0AA2B-1461-4937-B3AD-487E541425FD}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{CCD0AA2B-1461-4937-B3AD-487E541425FD}.Debug|x64.Build.0 = Debug|x64
|
||||
{CCD0AA2B-1461-4937-B3AD-487E541425FD}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "marisa-trie",
|
||||
"version": "0.2.6+20200926",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"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",
|
||||
|
||||
@ -4826,7 +4826,7 @@
|
||||
},
|
||||
"marisa-trie": {
|
||||
"baseline": "0.2.6+20200926",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"marl": {
|
||||
"baseline": "2022-03-02",
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "feefc2975f0e3c3aa1b468bdffccb21e9ef4dd54",
|
||||
"version": "0.2.6+20200926",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "35722f742acbc4cb5e0ce48eccf06830ca2cf2ba",
|
||||
"version": "0.2.6+20200926",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user