From 808982a65eb6c795ed2e8d3b92182f25bc1bc54a Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly@easycoding.org>
Date: Fri, 7 Feb 2020 18:10:48 +0100
Subject: [PATCH] Find and use packaged version of qr-code-generator library.

Disabled by default until upstream will merge proposed PR.

Can be enabled by forwarding `-DDESKTOP_APP_USE_PACKAGED_QRCODE:BOOL=ON`
cmake build option.

Signed-off-by: Vitaly Zaitsev <vitaly@easycoding.org>
---
 external/qr_code_generator/CMakeLists.txt | 47 ++++++++++++++---------
 variables.cmake                           |  1 +
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/external/qr_code_generator/CMakeLists.txt b/external/qr_code_generator/CMakeLists.txt
index 0f81125..5e3e9e9 100644
--- a/external/qr_code_generator/CMakeLists.txt
+++ b/external/qr_code_generator/CMakeLists.txt
@@ -4,24 +4,35 @@
 # For license and copyright information please follow this link:
 # https://github.com/desktop-app/legal/blob/master/LEGAL
 
-add_library(external_qr_code_generator OBJECT)
-add_library(desktop-app::external_qr_code_generator ALIAS external_qr_code_generator)
-init_target(external_qr_code_generator "(external)")
+if (DESKTOP_APP_USE_PACKAGED_QRCODE)
+    add_library(external_qr_code_generator INTERFACE IMPORTED GLOBAL)
+    add_library(desktop-app::external_qr_code_generator ALIAS external_qr_code_generator)
 
-set(qr_loc ${third_party_loc}/QR)
-set(qr_src ${qr_loc}/cpp)
+    find_library(QRCODE_LIBRARY NAMES "qrcodegencpp")
+    find_path(QRCODE_INCLUDE_DIRS "qrcodegencpp/QrCode.hpp")
 
-nice_target_sources(external_qr_code_generator ${qr_src}
-PRIVATE
-    BitBuffer.cpp
-    BitBuffer.hpp
-    QrCode.cpp
-    QrCode.hpp
-    QrSegment.cpp
-    QrSegment.hpp
-)
+    target_include_directories(external_qr_code_generator INTERFACE ${QRCODE_INCLUDE_DIRS})
+    target_link_libraries(external_qr_code_generator INTERFACE ${QRCODE_LIBRARY})
+else()
+    add_library(external_qr_code_generator OBJECT)
+    add_library(desktop-app::external_qr_code_generator ALIAS external_qr_code_generator)
+    init_target(external_qr_code_generator "(external)")
 
-target_include_directories(external_qr_code_generator
-PUBLIC
-    ${qr_src}
-)
+    set(qr_loc ${third_party_loc}/QR)
+    set(qr_src ${qr_loc}/cpp)
+
+    nice_target_sources(external_qr_code_generator ${qr_src}
+    PRIVATE
+        BitBuffer.cpp
+        BitBuffer.hpp
+        QrCode.cpp
+        QrCode.hpp
+        QrSegment.cpp
+        QrSegment.hpp
+    )
+
+    target_include_directories(external_qr_code_generator
+    PUBLIC
+        ${qr_src}
+    )
+endif()
diff --git a/variables.cmake b/variables.cmake
index 8723d52..6d7d2f0 100644
--- a/variables.cmake
+++ b/variables.cmake
@@ -26,6 +26,7 @@ option(DESKTOP_APP_USE_PACKAGED_RLOTTIE "Find rlottie using CMake instead of bun
 option(DESKTOP_APP_USE_PACKAGED_EXPECTED "Find expected using CMake instead of bundled one." ${DESKTOP_APP_USE_PACKAGED})
 option(DESKTOP_APP_USE_PACKAGED_VARIANT "Find mapbox-variant using CMake instead of bundled one." ${DESKTOP_APP_USE_PACKAGED})
 option(DESKTOP_APP_USE_PACKAGED_GSL "Find GSL using CMake instead of bundled one." ${DESKTOP_APP_USE_PACKAGED})
+option(DESKTOP_APP_USE_PACKAGED_QRCODE "Find qr-code-generator library using CMake instead of bundled one." OFF)
 option(DESKTOP_APP_USE_PACKAGED_FONTS "Use preinstalled fonts instead of bundled one." ${DESKTOP_APP_USE_PACKAGED})
 
 option(DESKTOP_APP_ENABLE_IPO_OPTIMIZATIONS "Enable IPO build optimizations." OFF)