mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2024-11-27 12:49:35 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

cmake: improve configuration,

Browse Source 
prefer find_package instead of PKG_CONFIG for leptonica and tiff
This commit is contained in:
zdenop 2021-09-19 16:40:31 +02:00
parent 2d397a8551
commit 89d86d6eee
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
CMakeLists.txt
View File

@ -343,17 +343,28 @@ if (SW_BUILD)
sw_execute()
else()
find_package(PkgConfig)
if(PKG_CONFIG_EXECUTABLE AND NOT Leptonica_DIR)
# Check for required library.
# option -DLeptonica_DIR=path => cmake hint where to find leptonica
find_package(Leptonica ${MINIMUM_LEPTONICA_VERSION} REQUIRED CONFIG)
if (NOT Leptonica_FOUND AND PKG_CONFIG_EXECUTABLE)
pkg_check_modules(Leptonica REQUIRED lept>=${MINIMUM_LEPTONICA_VERSION})
link_directories(${Leptonica_LIBRARY_DIRS})
else()
find_package(Leptonica ${MINIMUM_LEPTONICA_VERSION} REQUIRED CONFIG)
endif()
if (NOT Leptonica_FOUND)
message(FATAL_ERROR "Cannot find required library Leptonica. Quitting!")
endif(NOT Leptonica_FOUND)
include_directories(${Leptonica_INCLUDE_DIRS})
# Check for optional libraries.
find_package(TIFF) # for tesseractmain
if(NOT TIFF_FOUND AND PKG_CONFIG_EXECUTABLE)
# try PKG_CONFIG to find libarchive if cmake failed
pkg_check_modules(LibArchive libarchive)
endif()
if(TIFF_FOUND)
set(HAVE_TIFFIO_H ON)
include_directories(${TIFF_INCLUDE_DIRS})
endif(TIFF_FOUND)
if(DISABLE_ARCHIVE)
set(HAVE_LIBARCHIVE OFF)
else(DISABLE_ARCHIVE)
@ -481,9 +492,6 @@ include(SourceGroups)
add_definitions(-D_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS=1)
include_directories(${Leptonica_INCLUDE_DIRS})
include_directories(${LibArchive_INCLUDE_DIRS})
include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
if(ANDROID_TOOLCHAIN)
@ -724,12 +732,12 @@ endif()
add_executable (tesseract src/api/tesseractmain.cpp)
target_link_libraries (tesseract libtesseract)
if (WIN32 AND HAVE_TIFFIO_H)
target_link_libraries(tesseract tiff)
if (HAVE_TIFFIO_H AND WIN32)
target_link_libraries (tesseract ${TIFF_LIBRARIES})
endif()
if (OPENMP_BUILD AND UNIX)
target_link_libraries (tesseract pthread)
target_link_libraries (tesseract pthread)
endif()
########################################

2
cmake/Configure.cmake
View File

@ -94,7 +94,6 @@ set(include_files_list
CL/cl.h
OpenCL/cl.h
pango-1.0/pango/pango-features.h
tiffio.h
unicode/uchar.h
)
check_includes(include_files_list)
@ -111,6 +110,7 @@ file(APPEND ${AUTOCONFIG_SRC} "
#cmakedefine GRAPHICS_DISABLED ${GRAPHICS_DISABLED}
#cmakedefine FAST_FLOAT ${FAST_FLOAT}
#cmakedefine DISABLED_LEGACY_ENGINE ${DISABLED_LEGACY_ENGINE}
#cmakedefine HAVE_TIFFIO_H ${HAVE_TIFFIO_H}
#cmakedefine HAVE_LIBARCHIVE ${HAVE_LIBARCHIVE}
#cmakedefine HAVE_LIBCURL ${HAVE_LIBCURL}
")