diff options
| author | Christian Kamm <mail@ckamm.de> | 2017-06-08 14:02:34 +0300 |
|---|---|---|
| committer | Christian Kamm <mail@ckamm.de> | 2017-06-08 14:02:34 +0300 |
| commit | aeeb408c744704d6653a75d75214336aedb3d47b (patch) | |
| tree | a51544446b0109dd5975a5ea41d6af5cdb05d403 /cmake | |
| parent | 63c40b45e4153980599aa412c090f671158eeca8 (diff) | |
| parent | 18c39197e5814441c3c36a043d73acb922ffd081 (diff) | |
Merge branch '2.3'
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindQt5Keychain.cmake | 4 | ||||
| -rw-r--r-- | cmake/modules/FindQtKeychain.cmake | 39 |
2 files changed, 3 insertions, 40 deletions
diff --git a/cmake/modules/FindQt5Keychain.cmake b/cmake/modules/FindQt5Keychain.cmake index 6848763fe..4aff32d6f 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 diff --git a/cmake/modules/FindQtKeychain.cmake b/cmake/modules/FindQtKeychain.cmake deleted file mode 100644 index 6ef1cf7eb..000000000 --- a/cmake/modules/FindQtKeychain.cmake +++ /dev/null @@ -1,39 +0,0 @@ -# (c) 2014 Copyright ownCloud GmbH -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING* file. - -# - Try to find QtKeychain -# Once done this will define -# QTKEYCHAIN_FOUND - System has QtKeychain -# QTKEYCHAIN_INCLUDE_DIRS - The QtKeychain include directories -# QTKEYCHAIN_LIBRARIES - The libraries needed to use QtKeychain -# QTKEYCHAIN_DEFINITIONS - Compiler switches required for using LibXml2 - -find_path(QTKEYCHAIN_INCLUDE_DIR - NAMES - keychain.h - PATH_SUFFIXES - 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 - ) - -include(FindPackageHandleStandardArgs) -# handle the QUIETLY and REQUIRED arguments and set QTKEYCHAIN_FOUND to TRUE -# if all listed variables are TRUE -find_package_handle_standard_args(QtKeychain DEFAULT_MSG - QTKEYCHAIN_LIBRARY QTKEYCHAIN_INCLUDE_DIR) - -mark_as_advanced(QTKEYCHAIN_INCLUDE_DIR QTKEYCHAIN_LIBRARY) |