Skip to content

[tesseract]: find_package(lz4) in TesseractConfig.cmake #15180

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

Closed
mheyman wants to merge 4 commits into from
Closed

[tesseract]: find_package(lz4) in TesseractConfig.cmake #15180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5aa7bb4
[tesseract]: find_package(lz4) in TesseractConfig.cmake
Dec 17, 2020
316d244
[tesseract] port version bump
Dec 21, 2020
4d69fa2
[tesseract]: does find_package(libarchive) because that brings in lz4…
Dec 21, 2020
ca36fa7
[libarchive] has simple config that does find_package() on required d…
Dec 21, 2020
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
2 changes: 1 addition & 1 deletion ports/libarchive/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Source: libarchive
Version: 3.4.3
Port-Version: 2
Port-Version: 3
Homepage: https://github.com/libarchive/libarchive
Description: Library for reading and writing streaming archives
Build-Depends: zlib
Expand Down
16 changes: 16 additions & 0 deletions ports/libarchive/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,22 @@ vcpkg_configure_cmake(
)

vcpkg_install_cmake()

# create a very simple cmake config that just includes the required packages that have their own cmake configs
set(LIBARCHIVE_CONFIG "")
if(FEATURES MATCHES "lz4")
set(LIBARCHIVE_CONFIG "${LIBARCHIVE_CONFIG}find_package(lz4 REQUIRED)\n")
endif()
if(FEATURES MATCHES "lzma")
set(LIBARCHIVE_CONFIG "${LIBARCHIVE_CONFIG}find_package(liblzma REQUIRED)\n")
endif()
if(FEATURES MATCHES "zstd")
set(LIBARCHIVE_CONFIG "${LIBARCHIVE_CONFIG}find_package(zstd REQUIRED)\n")
endif()
if(LIBARCHIVE_CONFIG)
file(WRITE ${CURRENT_PACKAGES_DIR}/share/libarchive/libarchiveConfig.cmake "${LIBARCHIVE_CONFIG}")
endif()

vcpkg_copy_pdbs()

foreach(_feature IN LISTS FEATURE_OPTIONS)
Expand Down
2 changes: 1 addition & 1 deletion ports/tesseract/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Source: tesseract
Version: 4.1.1
Port-Version: 5
Port-Version: 6
Homepage: https://github.com/tesseract-ocr/tesseract
Description: An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.
Build-Depends: leptonica, libarchive
Expand Down
3 changes: 2 additions & 1 deletion ports/tesseract/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ find_package(ZLIB REQUIRED)
find_package(BZip2 REQUIRED)
find_package(LibXml2 REQUIRED)
find_package(zstd REQUIRED)
find_package(LibLZMA REQUIRED)" TESSERACT_CONFIG "${TESSERACT_CONFIG}")
find_package(LibLZMA REQUIRED)
find_package(libarchive REQUIRED)" TESSERACT_CONFIG "${TESSERACT_CONFIG}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/tesseract/TesseractConfig.cmake "${TESSERACT_CONFIG}")

vcpkg_copy_tools(TOOL_NAMES tesseract AUTO_CLEAN)
Expand Down