6db0ba2a38
Viktor Szakats
2026-06-17
Subject
cmake/FindGSS: drop "MIT Unknown" version value, related tidy ups
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
CMake/FindGSS.cmake+7 -12
| @@ -25,14 +25,13 @@ | |
| # | |
| # Input variables: | |
| # | |
| - | # - `GSS_ROOT_DIR`: Absolute path to the root installation of GSS. (also supported as environment) |
| + | # - `GSS_ROOT_DIR`: Absolute path to the root installation of GSS. (also supported as environment) |
| # | |
| # Defines: | |
| # | |
| - | # - `GSS_FOUND`: System has a GSS library. |
| - | # - `GSS_VERSION`: This is set to version advertised by pkg-config or read from manifest. |
| - | # In case the library is found but no version info available it is set to "unknown" |
| - | # - `CURL::gss`: GSS library target. |
| + | # - `GSS_FOUND`: System has GSS. |
| + | # - `GSS_VERSION`: Version of GSS. |
| + | # - `CURL::gss`: GSS library target. |
| # - `INTERFACE_CURL_GSS_FLAVOR`: Custom property. "GNU" or "MIT" if detected. | |
| set(_gnu_modname "gss") | |
| @@ -210,7 +209,7 @@ endif() | |
| set(GSS_VERSION ${_gss_version}) | |
| if(NOT GSS_VERSION) | |
| - | if(_gss_flavor STREQUAL "MIT") |
| + | if(_gss_flavor STREQUAL "MIT" AND WIN32) |
| if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.24) | |
| cmake_host_system_information(RESULT _mit_version QUERY WINDOWS_REGISTRY | |
| "HKLM/SOFTWARE/MIT/Kerberos/SDK/CurrentVersion" VALUE "VersionString") | |
| @@ -218,12 +217,8 @@ if(NOT GSS_VERSION) | |
| get_filename_component(_mit_version | |
| "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MIT\\Kerberos\\SDK\\CurrentVersion;VersionString]" NAME CACHE) | |
| endif() | |
| - | if(WIN32 AND _mit_version) |
| - | set(GSS_VERSION "${_mit_version}") |
| - | else() |
| - | set(GSS_VERSION "MIT Unknown") |
| - | endif() |
| - | else() # GNU |
| + | set(GSS_VERSION "${_mit_version}") |
| + | elseif(_gss_flavor STREQUAL "GNU") |
| if(_gss_INCLUDE_DIRS AND EXISTS "${_gss_INCLUDE_DIRS}/gss.h") | |
| set(_version_regex "#[\t ]*define[\t ]+GSS_VERSION[\t ]+\"([^\"]*)\"") | |
| file(STRINGS "${_gss_INCLUDE_DIRS}/gss.h" _version_str REGEX "${_version_regex}") | |