mirror of
https://codeberg.org/guix/guix.git
synced 2026-01-25 12:05:19 -06:00
3b8d7b10ae
* gnu/packages/jami.scm (libjami): Update to 20251212.0. [source]: Add libjami-pkgconf.patch and libjami-simdutf.patch patches. [inputs]: Add simdutf. (jami) Update to 20251212.0. [source]: Remove jami-unbundle-dependencies.patch, jami-libjami-headers-search.patch, jami-skip-tests-requiring-internet.patch and jami-find-package-avutil.patch; add jami-allow-system-zxing-cpp.patch, jami-libjami-cmake.patch and jami-avutil-link.patch patches. [inputs]: Delete qrencode. * gnu/packages/patches/jami-allow-system-zxing-cpp.patch: New file. * gnu/packages/patches/jami-avutil-link.patch: Likewise. * gnu/packages/patches/jami-libjami-cmake.patch: Likewise. * gnu/packages/patches/libjami-pkgconf.patch: Likewise. * gnu/packages/patches/libjami-simdutf.patch: Likewise. * gnu/packages/patches/jami-find-package-avutil.patch: Delete file. * gnu/packages/patches/jami-libjami-headers-search.patch: Likewise. * gnu/packages/patches/jami-skip-tests-requiring-internet.patch: Likewise. * gnu/packages/patches/jami-unbundle-dependencies.patch: Likewise. * gnu/packages/patches/libjami-ac-config-files.patch: Likewise. * gnu/packages/patches/libjami-sdbus-cpp-v2.patch: Likewise. * gnu/packages/patches/jami-qwindowkit.patch: Update upstream status. * gnu/local.mk (dist_patch_DATA): Update accordingly. Change-Id: I03ff9f4a892e1fead81d2c6e547f1c0cf405eb5f
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
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(
|