[opencc] De-vendor darts (#26581)

* Add tclap support

* Add darts support
This commit is contained in:
Mengna Li 2022-08-30 02:33:30 +08:00 committed by GitHub
parent 427f956bd5
commit 8f9a4f2de9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 4 deletions

View File

@ -1,8 +1,8 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 11d14e4..8180f21 100644 index 11d14e4..0fa3e1e 100644
--- a/src/CMakeLists.txt --- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt +++ b/src/CMakeLists.txt
@@ -137,6 +137,16 @@ set_target_properties( @@ -137,6 +137,21 @@ set_target_properties(
1.1 1.1
) )
@ -15,6 +15,11 @@ index 11d14e4..8180f21 100644
+ find_path(TCLAP_INCLUDE_DIRS "tclap/Arg.h") + find_path(TCLAP_INCLUDE_DIRS "tclap/Arg.h")
+ target_include_directories(libopencc PUBLIC ${TCLAP_INCLUDE_DIRS}) + target_include_directories(libopencc PUBLIC ${TCLAP_INCLUDE_DIRS})
+endif() +endif()
+
+if(USE_SYSTEM_DARTS)
+ find_path(DARTS_INCLUDE_DIRS "darts.h")
+ target_include_directories(libopencc PUBLIC ${DARTS_INCLUDE_DIRS})
+endif()
+ +
# Installation # Installation

View File

@ -19,6 +19,7 @@ vcpkg_cmake_configure(
-DENABLE_GTEST=OFF -DENABLE_GTEST=OFF
-DUSE_SYSTEM_RAPIDJSON=ON -DUSE_SYSTEM_RAPIDJSON=ON
-DUSE_SYSTEM_TCLAP=ON -DUSE_SYSTEM_TCLAP=ON
-DUSE_SYSTEM_DARTS=ON
) )
vcpkg_cmake_install( vcpkg_cmake_install(

View File

@ -1,12 +1,13 @@
{ {
"name": "opencc", "name": "opencc",
"version": "1.1.4", "version": "1.1.4",
"port-version": 2, "port-version": 3,
"description": "A project for conversions between Traditional Chinese, Simplified Chinese and Japanese Kanji (Shinjitai)", "description": "A project for conversions between Traditional Chinese, Simplified Chinese and Japanese Kanji (Shinjitai)",
"homepage": "https://github.com/BYVoid/OpenCC", "homepage": "https://github.com/BYVoid/OpenCC",
"license": "Apache-2.0", "license": "Apache-2.0",
"supports": "!(arm | uwp)", "supports": "!(arm | uwp)",
"dependencies": [ "dependencies": [
"darts-clone",
"rapidjson", "rapidjson",
"tclap", "tclap",
{ {

View File

@ -5210,7 +5210,7 @@
}, },
"opencc": { "opencc": {
"baseline": "1.1.4", "baseline": "1.1.4",
"port-version": 2 "port-version": 3
}, },
"opencensus-cpp": { "opencensus-cpp": {
"baseline": "2021-08-26", "baseline": "2021-08-26",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "463a25b4f9bfe6a259042a54cdd813ae7f96f4c9",
"version": "1.1.4",
"port-version": 3
},
{ {
"git-tree": "2339a48f2758995166b42d82c9eb22c880190ac3", "git-tree": "2339a48f2758995166b42d82c9eb22c880190ac3",
"version": "1.1.4", "version": "1.1.4",