[Pkg-owncloud-commits] [owncloud-client] 133/333: Find QtKeychain on multiarch Debian/Ubuntu

[Sandro Knauß]

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

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

commit bc3d298491b13491a98c46ec3c1adeafe158ffb0
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Wed Mar 12 18:17:43 2014 +0100

    Find QtKeychain on multiarch Debian/Ubuntu
---
 cmake/modules/FindQtKeychain.cmake | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/cmake/modules/FindQtKeychain.cmake b/cmake/modules/FindQtKeychain.cmake
index a0c81be..f9d54a9 100644
--- a/cmake/modules/FindQtKeychain.cmake
+++ b/cmake/modules/FindQtKeychain.cmake
@@ -7,7 +7,21 @@
 
 find_path(QTKEYCHAIN_INCLUDE_DIR qtkeychain/keychain.h)
 
-find_library(QTKEYCHAIN_LIBRARY NAMES libqtkeychain qtkeychain)
+find_library(QTKEYCHAIN_LIBRARY
+            NAMES
+              qtkeychain
+              libqtkeychain
+            PATHS
+               /usr/lib
+               /usr/lib/${CMAKE_ARCH_TRIPLET}
+               /usr/local/lib
+               /opt/local/lib
+               ${CMAKE_LIBRARY_PATH}
+               ${CMAKE_INSTALL_PREFIX}/lib
+            )
+
+message(${QTKEYCHAIN_LIBRARY})
+message(${QTKEYCHAIN_INCLUDE_DIR})
 
 include(FindPackageHandleStandardArgs)
 # handle the QUIETLY and REQUIRED arguments and set QTKEYCHAIN_FOUND to TRUE
@@ -15,4 +29,4 @@ include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(QtKeychain  DEFAULT_MSG
 	QTKEYCHAIN_LIBRARY QTKEYCHAIN_INCLUDE_DIR)
 
-mark_as_advanced(QTKEYCHAIN_INCLUDE_DIR QTKEYCHAIN_LIBRARY )
+mark_as_advanced(QTKEYCHAIN_INCLUDE_DIR QTKEYCHAIN_LIBRARY)

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