Improve leptonica search.

tesseract-ocr · Jan 26, 2016 · b48abd8 · b48abd8
1 parent 0970227
commit b48abd8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 54 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -46,8 +46,9 @@ set(VERSION_PLAIN ${VERSION_MAJOR}.${VERSION_MINOR})
 
 set(MINIMUM_LEPTONICA_VERSION 1.71)
 
-if (NOT Leptonica_DIR)
-find_package(Leptonica ${MINIMUM_LEPTONICA_VERSION} REQUIRED)
+if (NOT Leptonica_DIR AND NOT MSVC)
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(Leptonica REQUIRED lept)
 else()
 find_package(Leptonica ${MINIMUM_LEPTONICA_VERSION} REQUIRED CONFIG)
 endif()

diff --git a/cmake/FindLeptonica.cmake b/cmake/FindLeptonica.cmake