[Pkg-owncloud-commits] [owncloud-client] 01/135: Favor QtKeychain installed together with Qt

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee pushed a commit to branch master
in repository owncloud-client.

commit dca2b673380409d888df3604524815e4f4b8ff16
Author: Jocelyn Turcotte <jturcotte at woboq.com>
Date:   Mon May 8 18:19:29 2017 +0200

    Favor QtKeychain installed together with Qt
    
    By default we will look in /usr/lib, which would prevent us from
    using a different path for Qt as QtKeychain depends on Qt itself.
---
 cmake/modules/FindQt5Keychain.cmake | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/cmake/modules/FindQt5Keychain.cmake b/cmake/modules/FindQt5Keychain.cmake
index 809b9d6..6848763 100644
--- a/cmake/modules/FindQt5Keychain.cmake
+++ b/cmake/modules/FindQt5Keychain.cmake
@@ -9,9 +9,17 @@
 #  QTKEYCHAIN_LIBRARIES - The libraries needed to use QtKeychain
 #  QTKEYCHAIN_DEFINITIONS - Compiler switches required for using LibXml2
 
+# When we build our own Qt we also need to build QtKeychain with it
+# so that it doesn't pull a different Qt version. For that reason
+# first look in the Qt lib directory for QtKeychain.
+get_target_property(_QTCORE_LIB_PATH Qt5::Core IMPORTED_LOCATION_RELEASE)
+get_filename_component(QT_LIB_DIR "${_QTCORE_LIB_PATH}" DIRECTORY)
+
 find_path(QTKEYCHAIN_INCLUDE_DIR
             NAMES
               keychain.h
+            HINTS
+               ${QT_LIB_DIR}/../include
             PATH_SUFFIXES
               qt5keychain
             )
@@ -20,6 +28,8 @@ find_library(QTKEYCHAIN_LIBRARY
             NAMES
               qt5keychain
               lib5qtkeychain
+            HINTS
+               ${QT_LIB_DIR}
             PATHS
                /usr/lib
                /usr/lib/${CMAKE_ARCH_TRIPLET}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git