Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorKevin Ottens <kevin.ottens@nextcloud.com>2020-10-29 15:24:20 +0300
committerKevin Ottens <kevin.ottens@nextcloud.com>2020-11-02 15:19:48 +0300
commit3427dadaeb3527e6fe395b5aa5a0e6b299afc98b (patch)
treeaae03fb2c02c01e26f1b0883ecefbb7a3b11a5a4 /cmake
parentdfd6cce97818ab560e7bdd6805e758d3d80133dd (diff)
Get rid of FindQt5Keychain.cmake
QtKeychain provides Qt5KeychainConfig.cmake and friends nowadays, so no need to have a less reliable and outdated find module on our end. Also this shows that we were including keychain.h in the wrong way and were not using the link target, so both got fixed as well. Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/modules/FindQt5Keychain.cmake50
1 files changed, 0 insertions, 50 deletions
diff --git a/cmake/modules/FindQt5Keychain.cmake b/cmake/modules/FindQt5Keychain.cmake
deleted file mode 100644
index 4aff32d6f..000000000
--- a/cmake/modules/FindQt5Keychain.cmake
+++ /dev/null
@@ -1,50 +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
-
-# 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)
-
-# 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
- keychain.h
- HINTS
- ${QT_LIB_DIR}/../include
- PATH_SUFFIXES
- qt5keychain
- )
-
-find_library(QTKEYCHAIN_LIBRARY
- NAMES
- qt5keychain
- lib5qtkeychain
- HINTS
- ${QT_LIB_DIR}
- 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(Qt5Keychain DEFAULT_MSG
- QTKEYCHAIN_LIBRARY QTKEYCHAIN_INCLUDE_DIR)
-
-mark_as_advanced(QTKEYCHAIN_INCLUDE_DIR QTKEYCHAIN_LIBRARY)