From 1bf144ba78ff10d712b4de55d2797b9256948a1d Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Wed, 14 Jun 2023 10:56:06 +0200 Subject: [PATCH] Resolve an issue with detecting GSSAPI on macOS Spack, like VcPkg, sets the `CMAKE_FIND_FRAMEWORK` to `LAST`, as a result, similar to VcPkg, when Spack is used, FindGSSAPI opts for `gssapi_krb5` which is not what we want. By dropping the `gssapi_krb5` from the list of alternative names we can resolve this without much tinkering with internals of these package managers. Pick-to: 6.5 6.6 Fixes: QTBUG-114537 Change-Id: If517c409511f58e3bed78316a2030393dc249a40 Reviewed-by: Qt CI Bot Reviewed-by: Alexey Edelev Reviewed-by: Joerg Bornemann --- cmake/FindGSSAPI.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/FindGSSAPI.cmake b/cmake/FindGSSAPI.cmake index 91ad99c069..44594941e3 100644 --- a/cmake/FindGSSAPI.cmake +++ b/cmake/FindGSSAPI.cmake @@ -23,7 +23,7 @@ set(gssapi_library_names gssapi # FreeBSD gssapi_krb5 ) -if(VCPKG_TARGET_TRIPLET AND APPLE) +if(APPLE) list(REMOVE_ITEM gssapi_library_names "gssapi_krb5") endif()