1f11224232
Viktor Szakats
2025-10-08
Subject
cmake/FindGSS: fix `pkg-config` fallback logic for CMake <3.16
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
CMake/FindGSS.cmake+4 -12
| @@ -277,25 +277,17 @@ if(NOT _gss_FOUND) # Not found by pkg-config. Let us take more traditional appr | |
| endif() | |
| endif() | |
| else() | |
| - | # _gss_MODULE_NAME set since CMake 3.16 |
| - | if(_gss_MODULE_NAME STREQUAL _gnu_modname OR _gss_${_gnu_modname}_VERSION) |
| + | # _gss_MODULE_NAME set since CMake 3.16. |
| + | # _pkg_check_modules_pkg_name is undocumented and used as a fallback for CMake <3.16 versions. |
| + | if(_gss_MODULE_NAME STREQUAL _gnu_modname OR _pkg_check_modules_pkg_name STREQUAL _gnu_modname) |
| set(GSS_FLAVOUR "GNU") | |
| set(GSS_PC_REQUIRES "gss") | |
| - | if(NOT _gss_version) # for old CMake versions? |
| - | set(_gss_version ${_gss_${_gnu_modname}_VERSION}) |
| - | endif() |
| - | elseif(_gss_MODULE_NAME STREQUAL _mit_modname OR _gss_${_mit_modname}_VERSION) |
| + | elseif(_gss_MODULE_NAME STREQUAL _mit_modname OR _pkg_check_modules_pkg_name STREQUAL _mit_modname) |
| set(GSS_FLAVOUR "MIT") | |
| set(GSS_PC_REQUIRES "mit-krb5-gssapi") | |
| - | if(NOT _gss_version) # for old CMake versions? |
| - | set(_gss_version ${_gss_${_mit_modname}_VERSION}) |
| - | endif() |
| else() | |
| set(GSS_FLAVOUR "Heimdal") | |
| set(GSS_PC_REQUIRES "heimdal-gssapi") | |
| - | if(NOT _gss_version) # for old CMake versions? |
| - | set(_gss_version ${_gss_${_heimdal_modname}_VERSION}) |
| - | endif() |
| endif() | |
| message(STATUS "Found GSS/${GSS_FLAVOUR} (via pkg-config): ${_gss_INCLUDE_DIRS} (found version \"${_gss_version}\")") | |
| endif() | |