1
0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-15 12:07:08 +08:00

cmake: use ocv_check_modules()

This commit is contained in:
Alexander Alekhin
2019-04-15 21:54:50 +00:00
parent f6d0e94ec8
commit fa4ef14cd6
3 changed files with 26 additions and 23 deletions

View File

@@ -3,23 +3,22 @@ if(APPLE_FRAMEWORK)
ocv_module_disable(freetype) ocv_module_disable(freetype)
endif() endif()
if(PKG_CONFIG_FOUND) ocv_check_modules(FREETYPE freetype2)
pkg_search_module(FREETYPE freetype2) ocv_check_modules(HARFBUZZ harfbuzz)
pkg_search_module(HARFBUZZ harfbuzz)
endif()
if(OPENCV_INITIAL_PASS)
if(NOT FREETYPE_FOUND) if(NOT FREETYPE_FOUND)
message(STATUS "freetype2: NO") message(STATUS "freetype2: NO")
else() else()
message(STATUS "freetype2: YES") message(STATUS "freetype2: YES (ver ${FREETYPE_VERSION})")
endif() endif()
if(NOT HARFBUZZ_FOUND) if(NOT HARFBUZZ_FOUND)
message(STATUS "harfbuzz: NO") message(STATUS "harfbuzz: NO")
else() else()
message(STATUS "harfbuzz: YES") message(STATUS "harfbuzz: YES (ver ${HARFBUZZ_VERSION})")
endif()
endif() endif()
if(FREETYPE_FOUND AND HARFBUZZ_FOUND) if(FREETYPE_FOUND AND HARFBUZZ_FOUND)
ocv_define_module(freetype opencv_core opencv_imgproc WRAP python) ocv_define_module(freetype opencv_core opencv_imgproc WRAP python)

View File

@@ -2,10 +2,16 @@ set(the_description "Text Detection and Recognition")
ocv_define_module(text opencv_ml opencv_imgproc opencv_core opencv_features2d opencv_dnn OPTIONAL opencv_highgui WRAP python java) ocv_define_module(text opencv_ml opencv_imgproc opencv_core opencv_features2d opencv_dnn OPTIONAL opencv_highgui WRAP python java)
if(NOT CMAKE_CROSSCOMPILING OR OPENCV_FIND_TESSERACT) if(NOT CMAKE_CROSSCOMPILING OR OPENCV_FIND_TESSERACT)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) find_package(Tesseract QUIET) # Prefer CMake's standard locations (including Tesseract_DIR)
find_package(Tesseract QUIET) if(NOT Tesseract_FOUND)
include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindTesseract.cmake") # OpenCV's fallback
endif()
if(Tesseract_FOUND) if(Tesseract_FOUND)
message(STATUS "Tesseract: YES") if(Tesseract_VERSION)
message(STATUS "Tesseract: YES (ver ${Tesseract_VERSION})")
else()
message(STATUS "Tesseract: YES (ver unknown)")
endif()
set(HAVE_TESSERACT 1) set(HAVE_TESSERACT 1)
ocv_include_directories(${Tesseract_INCLUDE_DIRS}) ocv_include_directories(${Tesseract_INCLUDE_DIRS})
ocv_target_link_libraries(${the_module} ${Tesseract_LIBRARIES}) ocv_target_link_libraries(${the_module} ${Tesseract_LIBRARIES})

View File

@@ -1,7 +1,5 @@
# Tesseract OCR # Tesseract OCR
if(COMMAND pkg_check_modules) ocv_check_modules(Tesseract tesseract) # lept is excluded (not a direct dependency)
pkg_check_modules(Tesseract tesseract lept)
endif()
if(NOT Tesseract_FOUND) if(NOT Tesseract_FOUND)
find_path(Tesseract_INCLUDE_DIR tesseract/baseapi.h find_path(Tesseract_INCLUDE_DIR tesseract/baseapi.h
HINTS HINTS