blob: 98020613b191e4518e48b1e3f0c5be09b92e1762 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
Upstream-status: <https://review.jami.net/c/jami-client-qt/+/31461>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c046b597..3251762e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -714,13 +714,18 @@ else()
endif()
# ZXing-cpp configuration
-set(ZXING_EXAMPLES OFF CACHE BOOL "")
-set(ZXING_BLACKBOX_TESTS OFF CACHE BOOL "")
-add_subdirectory(3rdparty/zxing-cpp EXCLUDE_FROM_ALL)
-
-# Add ZXing-cpp to includes and libraries
-list(APPEND CLIENT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/zxing-cpp/core/src)
-list(APPEND CLIENT_LIBS ZXing)
+pkg_check_modules(zxing IMPORTED_TARGET zxing)
+if(zxing_FOUND)
+ message(STATUS "Using system-provided ZXing-cpp")
+ list(APPEND CLIENT_INCLUDE_DIRS ${zxing_INCLUDE_DIRS})
+ list(APPEND CLIENT_LIBS PkgConfig::zxing)
+else()
+ set(ZXING_EXAMPLES OFF CACHE BOOL "")
+ set(ZXING_BLACKBOX_TESTS OFF CACHE BOOL "")
+ add_subdirectory(3rdparty/zxing-cpp EXCLUDE_FROM_ALL)
+ list(APPEND CLIENT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/zxing-cpp/core/src)
+ list(APPEND CLIENT_LIBS ZXing)
+endif()
# common executable sources
qt_add_executable(
|
