[Pkg-owncloud-commits] [owncloud-client] 26/135: Fix build on Debian 7 (CMake pre 2.8.12)

Sandro Knauß hefee at debian.org
Sat Sep 9 14:28:29 UTC 2017


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

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

commit 78dede2ac4468d5fc9bae79f57a49d591c3782fc
Author: Dominik Schmidt <dev at dominik-schmidt.de>
Date:   Fri May 26 13:24:54 2017 +0200

    Fix build on Debian 7 (CMake pre 2.8.12)
---
 cmake/modules/FindQt5Keychain.cmake | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cmake/modules/FindQt5Keychain.cmake b/cmake/modules/FindQt5Keychain.cmake
index 6848763..4aff32d 100644
--- a/cmake/modules/FindQt5Keychain.cmake
+++ b/cmake/modules/FindQt5Keychain.cmake
@@ -13,7 +13,9 @@
 # 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)
+
+# Use PATH here because Debian 7.0 has CMake 2.8.9 and DIRECTORY is only available from 2.8.12+
+get_filename_component(QT_LIB_DIR "${_QTCORE_LIB_PATH}" PATH)
 
 find_path(QTKEYCHAIN_INCLUDE_DIR
             NAMES

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



More information about the Pkg-owncloud-commits mailing list