Merge pull request #3185

852378ac cmake: ZBar - Android support, fix find_package without pkg-config (xiphon)
2020-10-28 00:40:22 -07:00
parent 08635e3030 852378accb
commit 299067a273
2 changed files with 25 additions and 9 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,7 +134,7 @@ message(STATUS "OpenSSL: libraries at ${OPENSSL_LIBRARIES} ${OPENSSL_SSL_LIBRARI
 # Zbar (for QR scanner)
 if(WITH_SCANNER)
    add_definitions(-DWITH_SCANNER)
-    find_package(ZBar0)
+    find_package(ZBar0 REQUIRED)
    message(STATUS "libzbar: include dir at ${ZBAR_INCLUDE_DIR}")
    message(STATUS "libzbar: libraries at ${ZBAR_LIBRARIES}")
 endif()