From cdd4c0b854fd4d27fa1d9bd941df03888301780a Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Wed, 2 Jan 2019 15:24:03 +0100
Subject: [PATCH] Find libqrencode using cmake/pkg-config logic

---
 cmake/FindQrencode.cmake                              | 11 +++++++++++
 plugins/omemo/CMakeLists.txt                          |  6 ++++--
 .../omemo/vapi/{qrencode.vapi => libqrencode.vapi}    |  0
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 cmake/FindQrencode.cmake
 rename plugins/omemo/vapi/{qrencode.vapi => libqrencode.vapi} (100%)

diff --git a/cmake/FindQrencode.cmake b/cmake/FindQrencode.cmake
new file mode 100644
index 00000000..ccbf4f4e
--- /dev/null
+++ b/cmake/FindQrencode.cmake
@@ -0,0 +1,11 @@
+include(PkgConfigWithFallback)
+find_pkg_config_with_fallback(Qrencode
+    PKG_CONFIG_NAME libqrencode
+    LIB_NAMES qrencode
+    INCLUDE_NAMES qrencode.h
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Qrencode
+    REQUIRED_VARS Qrencode_LIBRARY
+    VERSION_VAR Qrencode_VERSION)
diff --git a/plugins/omemo/CMakeLists.txt b/plugins/omemo/CMakeLists.txt
index b2145be7..92d5cd51 100644
--- a/plugins/omemo/CMakeLists.txt
+++ b/plugins/omemo/CMakeLists.txt
@@ -10,6 +10,7 @@ find_packages(OMEMO_PACKAGES REQUIRED
     GObject
     GTK3
     Soup
+    Qrencode
 )
 
 set(RESOURCE_LIST
@@ -57,17 +58,18 @@ CUSTOM_VAPIS
     ${CMAKE_BINARY_DIR}/exports/xmpp-vala.vapi
     ${CMAKE_BINARY_DIR}/exports/qlite.vapi
     ${CMAKE_BINARY_DIR}/exports/dino.vapi
-    ${CMAKE_CURRENT_SOURCE_DIR}/vapi/qrencode.vapi
 PACKAGES
     ${OMEMO_PACKAGES}
 GRESOURCES
     ${OMEMO_GRESOURCES_XML}
+OPTIONS
+    --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi
 )
 
 add_definitions(${VALA_CFLAGS} -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\" -DLOCALE_INSTALL_DIR=\"${LOCALE_INSTALL_DIR}\")
 add_library(omemo SHARED ${OMEMO_VALA_C} ${OMEMO_GRESOURCES_TARGET})
 add_dependencies(omemo ${GETTEXT_PACKAGE}-translations)
-target_link_libraries(omemo libdino signal-protocol-vala qrencode ${OMEMO_PACKAGES})
+target_link_libraries(omemo libdino signal-protocol-vala ${OMEMO_PACKAGES})
 set_target_properties(omemo PROPERTIES PREFIX "")
 set_target_properties(omemo PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/plugins/)
 
diff --git a/plugins/omemo/vapi/qrencode.vapi b/plugins/omemo/vapi/libqrencode.vapi
similarity index 100%
rename from plugins/omemo/vapi/qrencode.vapi
rename to plugins/omemo/vapi/libqrencode.vapi