From 7221ba36d936b738a46c7320c5b1dc02677d0ca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Sun, 8 May 2022 08:36:20 +0200 Subject: [PATCH 1/3] Revert "Define a poper exported CMake target instead of introducing an alias." This reverts commit e5eeb1763e295f6b05a3f008ee7ae192fd74ed0c. --- QtKeychainConfig.cmake.in | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/QtKeychainConfig.cmake.in b/QtKeychainConfig.cmake.in index 41abb0e..d849ded 100644 --- a/QtKeychainConfig.cmake.in +++ b/QtKeychainConfig.cmake.in @@ -18,13 +18,7 @@ if(UNIX AND NOT APPLE AND NOT ANDROID) find_dependency(Qt@QTKEYCHAIN_VERSION_INFIX@DBus) endif() -get_target_property(QTKEYCHAIN_LIBRARIES "@QTKEYCHAIN_TARGET_NAME@" LOCATION) +set(QTKEYCHAIN_LIBRARIES "@QTKEYCHAIN_TARGET_NAME@") get_target_property(QTKEYCHAIN_INCLUDE_DIRS "@QTKEYCHAIN_TARGET_NAME@" INTERFACE_INCLUDE_DIRECTORIES) -if(NOT TARGET Qt@QTKEYCHAIN_VERSION_INFIX@Keychain::Qt@QTKEYCHAIN_VERSION_INFIX@Keychain) - add_library(Qt@QTKEYCHAIN_VERSION_INFIX@Keychain::Qt@QTKEYCHAIN_VERSION_INFIX@Keychain UNKNOWN IMPORTED) - set_target_properties(Qt@QTKEYCHAIN_VERSION_INFIX@Keychain::Qt@QTKEYCHAIN_VERSION_INFIX@Keychain PROPERTIES - IMPORTED_LOCATION "${QTKEYCHAIN_LIBRARIES}" - INTERFACE_INCLUDE_DIRECTORIES "${QTKEYCHAIN_INCLUDE_DIRS}" - ) -endif() +add_library(Qt@QTKEYCHAIN_VERSION_INFIX@Keychain::Qt@QTKEYCHAIN_VERSION_INFIX@Keychain ALIAS qt@QTKEYCHAIN_VERSION_INFIX@keychain) From c5e10d85b388ad81852faf88c2b754ff31aa3e8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Sun, 8 May 2022 09:05:10 +0200 Subject: [PATCH 2/3] Only create Qt5Keychain::Qt5Keychain/Qt6Keychain::Qt6Keychain if cmake >= 3.18.0 --- QtKeychainConfig.cmake.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/QtKeychainConfig.cmake.in b/QtKeychainConfig.cmake.in index d849ded..dcf1905 100644 --- a/QtKeychainConfig.cmake.in +++ b/QtKeychainConfig.cmake.in @@ -21,4 +21,7 @@ endif() set(QTKEYCHAIN_LIBRARIES "@QTKEYCHAIN_TARGET_NAME@") get_target_property(QTKEYCHAIN_INCLUDE_DIRS "@QTKEYCHAIN_TARGET_NAME@" INTERFACE_INCLUDE_DIRECTORIES) -add_library(Qt@QTKEYCHAIN_VERSION_INFIX@Keychain::Qt@QTKEYCHAIN_VERSION_INFIX@Keychain ALIAS qt@QTKEYCHAIN_VERSION_INFIX@keychain) +if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.18.0) + add_library(Qt@QTKEYCHAIN_VERSION_INFIX@Keychain::Qt@QTKEYCHAIN_VERSION_INFIX@Keychain ALIAS qt@QTKEYCHAIN_VERSION_INFIX@keychain) +endif() + From 07452a8ecb4f36bdcd8fbd56b947a95b3573bd58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Sun, 8 May 2022 09:09:49 +0200 Subject: [PATCH 3/3] call check_required_compnents for a proper feedback in cmake logs --- QtKeychainConfig.cmake.in | 1 + 1 file changed, 1 insertion(+) diff --git a/QtKeychainConfig.cmake.in b/QtKeychainConfig.cmake.in index dcf1905..7addba9 100644 --- a/QtKeychainConfig.cmake.in +++ b/QtKeychainConfig.cmake.in @@ -25,3 +25,4 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.18.0) add_library(Qt@QTKEYCHAIN_VERSION_INFIX@Keychain::Qt@QTKEYCHAIN_VERSION_INFIX@Keychain ALIAS qt@QTKEYCHAIN_VERSION_INFIX@keychain) endif() +check_required_components(Qt@QTKEYCHAIN_VERSION_INFIX@Keychain)