Commit 7bba4cf0 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files

Merge pull request #2093 from alalek:cmake_fix_pkgconfig_libs

parents c7f2e2a2 fa4ef14c

modules/freetype/CMakeLists.txt

+14 −15
Original line number Diff line number Diff line
@@ -3,23 +3,22 @@ if(APPLE_FRAMEWORK) 
  ocv_module_disable(freetype)

endif()



if(PKG_CONFIG_FOUND)

  pkg_search_module(FREETYPE freetype2)

  pkg_search_module(HARFBUZZ harfbuzz)

endif()

ocv_check_modules(FREETYPE freetype2)

ocv_check_modules(HARFBUZZ harfbuzz)



if(OPENCV_INITIAL_PASS)

  if(NOT FREETYPE_FOUND)

    message(STATUS "freetype2:   NO")

  else()

  message(STATUS "freetype2:   YES")

    message(STATUS "freetype2:   YES (ver ${FREETYPE_VERSION})")

  endif()



  if(NOT HARFBUZZ_FOUND)

    message(STATUS "harfbuzz:    NO")

  else()

  message(STATUS "harfbuzz:    YES")

    message(STATUS "harfbuzz:    YES (ver ${HARFBUZZ_VERSION})")

  endif()

endif()





if(FREETYPE_FOUND AND HARFBUZZ_FOUND)

  ocv_define_module(freetype opencv_core opencv_imgproc WRAP python)

modules/text/CMakeLists.txt

+9 −3
Original line number Diff line number Diff line
@@ -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)



if(NOT CMAKE_CROSSCOMPILING OR OPENCV_FIND_TESSERACT)

  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)

  find_package(Tesseract QUIET)

  find_package(Tesseract QUIET)  # Prefer CMake's standard locations (including Tesseract_DIR)

  if(NOT Tesseract_FOUND)

    include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindTesseract.cmake")  # OpenCV's fallback

  endif()

  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)

    ocv_include_directories(${Tesseract_INCLUDE_DIRS})

    ocv_target_link_libraries(${the_module} ${Tesseract_LIBRARIES})

modules/text/cmake/FindTesseract.cmake

+1 −3
Original line number Diff line number Diff line 
# Tesseract OCR

if(COMMAND pkg_check_modules)

  pkg_check_modules(Tesseract tesseract lept)

endif()

ocv_check_modules(Tesseract tesseract) # lept is excluded (not a direct dependency)

if(NOT Tesseract_FOUND)

  find_path(Tesseract_INCLUDE_DIR tesseract/baseapi.h

    HINTS