3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-15 01:29:18 +08:00
Code Issues Projects Releases Wiki Activity

[tesseract] Fix static linking. [icu][tiff] Add patches in toolchain to fix static linking.

Browse Source
This commit is contained in:
Robert Schumacher 2017-11-15 21:58:26 -08:00
parent 4228e1e389
commit 7e3dcc4f09
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/tesseract/CONTROL
View File

@ -1,4 +1,4 @@
Source: tesseract Source: tesseract
Version: 3.05.01-1 Version: 3.05.01-2
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.
Build-Depends: leptonica, icu Build-Depends: leptonica, icu

3
ports/tesseract/portfile.cmake
View File

@ -19,6 +19,9 @@ vcpkg_apply_patches(
${CMAKE_CURRENT_LIST_DIR}/use-vcpkg-icu.patch ${CMAKE_CURRENT_LIST_DIR}/use-vcpkg-icu.patch
) )
# The built-in cmake FindICU is better
file(REMOVE ${SOURCE_PATH}/cmake/FindICU.cmake)
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA PREFER_NINJA

20
scripts/buildsystems/vcpkg.cmake
View File

@ -157,10 +157,20 @@ macro(find_package name)
unset(Boost_USE_STATIC_LIBS) unset(Boost_USE_STATIC_LIBS)
unset(Boost_USE_MULTITHREADED) unset(Boost_USE_MULTITHREADED)
unset(Boost_USE_STATIC_RUNTIME) unset(Boost_USE_STATIC_RUNTIME)
endif() _find_package(${ARGV})
_find_package(${ARGV}) elseif("${name}" STREQUAL "ICU")
function(_vcpkg_find_in_list)
if("${name}" STREQUAL "TIFF") list(FIND ARGV "COMPONENTS" COMPONENTS_IDX)
set(COMPONENTS_IDX ${COMPONENTS_IDX} PARENT_SCOPE)
endfunction()
_vcpkg_find_in_list(${ARGV})
if(NOT COMPONENTS_IDX EQUAL -1)
_find_package(${ARGV} COMPONENTS data)
else()
_find_package(${ARGV})
endif()
elseif("${name}" STREQUAL "TIFF")
_find_package(${ARGV})
find_package(LibLZMA) find_package(LibLZMA)
if(TARGET TIFF::TIFF) if(TARGET TIFF::TIFF)
set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${LIBLZMA_LIBRARIES}) set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${LIBLZMA_LIBRARIES})
@ -168,6 +178,8 @@ macro(find_package name)
if(TIFF_LIBRARIES) if(TIFF_LIBRARIES)
list(APPEND TIFF_LIBRARIES ${LIBLZMA_LIBRARIES}) list(APPEND TIFF_LIBRARIES ${LIBLZMA_LIBRARIES})
endif() endif()
else()
_find_package(${ARGV})
endif() endif()
endmacro() endmacro()