cmake: fix pkg-config-based detection in FindGSS.cmake
#14430
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vszakats
force-pushed
the
cm-findgss-fixup
branch
2 times, most recently
from
98e0ded
to
17679e9
Compare
- fix `pkg_search_module()` result prefix to match what code expects: `_GSS` (was: `_GSS_PKG`). Update variable that were in sync with old prefix. - update the pkg-config codepath to use `_GSS_MODULE_NAME` to detect GSS flavour. This requires CMake 3.16. Otherwise fall back to the old method. (The old method doesn't seem to work anymore (?) as of CMake 3.30.1. Contrary to CMake docs, `<prefix>_<modulename>_VERSION` variable is left empty.) - update the pkg-config codepath to use `_GSS_VERSION` set by CMake. Resort to the old code when this variable is empty. (The old code doesn't seem to work anymore (?) as of CMake 3.30.1) Closes #xxxxx
vszakats
force-pushed
the
cm-findgss-fixup
branch
2 times, most recently
from
16bda97
to
aeb1d46
Compare
GHA/macos: try fixing GSS heimdal detection
silence 2077, 2078 for cmake GSS heimdal job enable heimdal for autotools job extend TFLAGS exception for autotools heimdal builds
vszakats
force-pushed
the
cm-findgss-fixup
branch
from
aeb1d46
to
aac730d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Before this patch
pkg-config-based detection was ignored, and usedsolely as a path hint for native detection.
fix
pkg_search_module()result prefix to match what code expects:_GSS(was:_GSS_PKG). Update variable that were in sync with oldprefix.
update the pkg-config codepath to use
_GSS_MODULE_NAMEto detectGSS flavour. This requires CMake 3.16.
Otherwise fall back to the old method. (The old method doesn't seem to
work anymore (?) as of CMake 3.30.1. Documented
<prefix>_<modulename>_VERSIONvariable is defined, but empty.)update the pkg-config codepath to use
_GSS_VERSIONset by CMake.Resort to the old code when this variable is empty. (The old code
doesn't seem to work anymore (?) as of CMake 3.30.1)
fix pkg-config codepath to set the documented result variables.
align native detection variable names with those generated by
pkg_search_module()in the pkg-config codepath.GHA/macos: enable GSS Heimdal in a cmake job.
Uses the native detection.
GHA/linux: enable GSS Heimdal in cmake and autotools jobs.
CMake uses
pkg-config-based detection.suppress test 2077 and 2078 results on Linux + Heimdal.
Failing with valgrind errors in both autotools and cmake builds:
https://github.com/curl/curl/actions/runs/10282222581/job/28453472068?pr=14430#step:38:3638
https://github.com/curl/curl/actions/runs/10282222581/job/28453473398?pr=14430#step:38:7831
Closes #14430