mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 10:21:07 +08:00
[tesseract] fix downstream usage (#26378)
* [tesseract5] fix downstream usage * fix references
This commit is contained in:
parent
5fb8f6c24e
commit
d3431006f2
11
ports/opencv3/0018-fix-depend-tesseract.patch
Normal file
11
ports/opencv3/0018-fix-depend-tesseract.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- a/modules/text/cmake/init.cmake
|
||||||
|
+++ b/modules/text/cmake/init.cmake
|
||||||
|
@@ -4,6 +4,8 @@ OCV_OPTION(WITH_TESSERACT "Include Tesseract OCR library support" (NOT CMAKE_CRO
|
||||||
|
if(NOT HAVE_TESSERACT
|
||||||
|
AND (WITH_TESSERACT OR OPENCV_FIND_TESSERACT)
|
||||||
|
)
|
||||||
|
+ find_package(Tesseract CONFIG REQUIRED)
|
||||||
|
+ set(Tesseract_LIBRARIES Tesseract::libtesseract)
|
||||||
|
if(NOT Tesseract_FOUND)
|
||||||
|
find_package(Tesseract QUIET) # Prefer CMake's standard locations (including Tesseract_DIR)
|
||||||
|
endif()
|
@ -157,6 +157,7 @@ if("contrib" IN_LIST FEATURES)
|
|||||||
0007-fix-hdf5.patch
|
0007-fix-hdf5.patch
|
||||||
0013-fix-ceres.patch
|
0013-fix-ceres.patch
|
||||||
0016-fix-freetype-contrib.patch
|
0016-fix-freetype-contrib.patch
|
||||||
|
0018-fix-depend-tesseract.patch
|
||||||
)
|
)
|
||||||
set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules")
|
set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules")
|
||||||
|
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "opencv3",
|
"name": "opencv3",
|
||||||
"version": "3.4.18",
|
"version": "3.4.18",
|
||||||
|
"port-version": 1,
|
||||||
"description": "Open Source Computer Vision Library",
|
"description": "Open Source Computer Vision Library",
|
||||||
"homepage": "https://github.com/opencv/opencv",
|
"homepage": "https://github.com/opencv/opencv",
|
||||||
"license": "BSD-3-Clause",
|
"license": "BSD-3-Clause",
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
diff --git a/modules/text/cmake/init.cmake b/modules/text/cmake/init.cmake
|
|
||||||
index 254757e..73194ec 100644
|
|
||||||
--- a/modules/text/cmake/init.cmake
|
--- a/modules/text/cmake/init.cmake
|
||||||
+++ b/modules/text/cmake/init.cmake
|
+++ b/modules/text/cmake/init.cmake
|
||||||
@@ -4,6 +4,8 @@ OCV_OPTION(WITH_TESSERACT "Include Tesseract OCR library support" (NOT CMAKE_CRO
|
@@ -4,6 +4,8 @@ OCV_OPTION(WITH_TESSERACT "Include Tesseract OCR library support" (NOT CMAKE_CRO
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "opencv4",
|
"name": "opencv4",
|
||||||
"version": "4.6.0",
|
"version": "4.6.0",
|
||||||
"port-version": 1,
|
"port-version": 2,
|
||||||
"description": "computer vision library",
|
"description": "computer vision library",
|
||||||
"homepage": "https://github.com/opencv/opencv",
|
"homepage": "https://github.com/opencv/opencv",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index bd2649d..f932913 100644
|
|
||||||
--- a/CMakeLists.txt
|
--- a/CMakeLists.txt
|
||||||
+++ b/CMakeLists.txt
|
+++ b/CMakeLists.txt
|
||||||
@@ -792,7 +792,8 @@ if(OpenCL_FOUND)
|
@@ -792,7 +792,8 @@ if(OpenCL_FOUND)
|
||||||
|
@ -51,6 +51,7 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/tesseract)
|
|||||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/tesseract/TesseractConfig.cmake"
|
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/tesseract/TesseractConfig.cmake"
|
||||||
"find_dependency(Leptonica)"
|
"find_dependency(Leptonica)"
|
||||||
[[
|
[[
|
||||||
|
find_dependency(CURL)
|
||||||
find_dependency(Leptonica)
|
find_dependency(Leptonica)
|
||||||
find_dependency(LibArchive)
|
find_dependency(LibArchive)
|
||||||
]]
|
]]
|
||||||
|
@ -1,11 +1,13 @@
|
|||||||
{
|
{
|
||||||
"name": "tesseract",
|
"name": "tesseract",
|
||||||
"version": "5.2.0",
|
"version": "5.2.0",
|
||||||
|
"port-version": 1,
|
||||||
"description": "An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.",
|
"description": "An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.",
|
||||||
"homepage": "https://github.com/tesseract-ocr/tesseract",
|
"homepage": "https://github.com/tesseract-ocr/tesseract",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"supports": "!(arm & (osx | linux))",
|
"supports": "!(arm & (osx | linux))",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
|
"curl",
|
||||||
"leptonica",
|
"leptonica",
|
||||||
"libarchive",
|
"libarchive",
|
||||||
{
|
{
|
||||||
|
@ -5202,11 +5202,11 @@
|
|||||||
},
|
},
|
||||||
"opencv3": {
|
"opencv3": {
|
||||||
"baseline": "3.4.18",
|
"baseline": "3.4.18",
|
||||||
"port-version": 0
|
"port-version": 1
|
||||||
},
|
},
|
||||||
"opencv4": {
|
"opencv4": {
|
||||||
"baseline": "4.6.0",
|
"baseline": "4.6.0",
|
||||||
"port-version": 1
|
"port-version": 2
|
||||||
},
|
},
|
||||||
"opendnp3": {
|
"opendnp3": {
|
||||||
"baseline": "3.1.1",
|
"baseline": "3.1.1",
|
||||||
@ -7046,7 +7046,7 @@
|
|||||||
},
|
},
|
||||||
"tesseract": {
|
"tesseract": {
|
||||||
"baseline": "5.2.0",
|
"baseline": "5.2.0",
|
||||||
"port-version": 0
|
"port-version": 1
|
||||||
},
|
},
|
||||||
"tfhe": {
|
"tfhe": {
|
||||||
"baseline": "1.0.1",
|
"baseline": "1.0.1",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "6f45f46b8a492b795cce92786a3d2048ef24ef38",
|
||||||
|
"version": "3.4.18",
|
||||||
|
"port-version": 1
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "15c9083efa4c00674bef4fbca443a662fe6dd5cd",
|
"git-tree": "15c9083efa4c00674bef4fbca443a662fe6dd5cd",
|
||||||
"version": "3.4.18",
|
"version": "3.4.18",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "57554ec83d4e4667344f005a1f61be8164cbf58a",
|
||||||
|
"version": "4.6.0",
|
||||||
|
"port-version": 2
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "a6c9bded8fc4ad22bea6869caecf2881c8da2d41",
|
"git-tree": "a6c9bded8fc4ad22bea6869caecf2881c8da2d41",
|
||||||
"version": "4.6.0",
|
"version": "4.6.0",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "ea93f36603ca265da43ef28d6583871ef3d97b43",
|
||||||
|
"version": "5.2.0",
|
||||||
|
"port-version": 1
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "5ea8fcd243e8aa38e1a83eaa1c745fc53a3464cc",
|
"git-tree": "5ea8fcd243e8aa38e1a83eaa1c745fc53a3464cc",
|
||||||
"version": "5.2.0",
|
"version": "5.2.0",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user