-
-
Notifications
You must be signed in to change notification settings - Fork 6.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
cmake: replace check_include_file_concat()
for LDAP and GSS detection
#15157
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
That's a deep rabbit-hole of issues...
Related commit/PR(s): #436 https://cmake.org/cmake/help/latest/module/CMakePushCheckState.html edit: Most of these were addressed via separate PRs. |
vszakats
changed the title
cmake: use
cmake: use Oct 5, 2024
cmake_{push,pop}_check_state()
in LDAP detectioncmake_{push,pop}_check_state()
more, and other tidy-ups
Analysis of PR #15157 at bc0992c7: Test 593 failed, which has NOT been flaky recently, so there could be a real issue in the PR. Generated by Testclutch |
vszakats
force-pushed
the
cm-use-pushpop
branch
from
October 5, 2024 14:23
bc0992c
to
d1ac210
Compare
4 tasks
vszakats
force-pushed
the
cm-use-pushpop
branch
from
October 6, 2024 09:34
b49f3c3
to
f7f4e78
Compare
vszakats
changed the title
cmake: use
cmake: use Oct 6, 2024
cmake_{push,pop}_check_state()
more, and other tidy-upscmake_push_check_state()
more, other tidy-ups
vszakats
force-pushed
the
cm-use-pushpop
branch
from
October 10, 2024 15:11
f7f4e78
to
d63202d
Compare
vszakats
added a commit
to vszakats/curl
that referenced
this pull request
Oct 10, 2024
…DES` Cherry-picked from curl#15157
This was referenced Oct 10, 2024
vszakats
added a commit
that referenced
this pull request
Oct 10, 2024
Enclose `CMAKE_EXTRA_INCLUDE_FILES`, `CMAKE_REQUIRED_DEFINITIONS`, `CMAKE_REQUIRED_FLAGS`, `CMAKE_REQUIRED_INCLUDES`, `CMAKE_REQUIRED_LIBRARIES`, `CMAKE_REQUIRED_LINK_OPTIONS`, settings within `cmake_push_check_state()`/`cmake_pop_check_state()` calls. It prevents spilling them into other feature checks. It also replaces manual resets found in some places (which can have the undesired side-effect of destroying values meant for global use.) Cherry-picked from #15157 Closes #15251
vszakats
added a commit
that referenced
this pull request
Oct 10, 2024
…DES` It was done for `zlib`, `brotli`, `libpsl`, `libssh2`, `wolfssh` (a copy-paste case for `wolfssh`). Feature detections should not rely by default on dependency headers. There is no evidence they do now. If it becomes necessary, headers should added for the duration of the feature check. Ref: 118977f Cherry-picked from #15157 Closes #15252
vszakats
added a commit
that referenced
this pull request
Oct 10, 2024
Add comments saying when we want values set in feature check option variables to apply to all feature checks, globally. These are currently: `ws2_32` and `socket` libraries, and `-D_WIN32_WINNT=` macro. Also use `list(APPEND ...)` for the libraries to avoid overwriting potentially existing values. Cherry-picked from #15157 Closes #15253
2 tasks
ldap.h includes lber.h. If you know of a system where this is not the case, let us know.
include gssapi/gssapi.h when checking for gssapi_generic.h/gssapi_krb5.h To continue doing what ./configure does.
vszakats
force-pushed
the
cm-use-pushpop
branch
from
October 10, 2024 18:24
d63202d
to
fc16a2d
Compare
vszakats
changed the title
cmake: use
cmake: replace Oct 10, 2024
cmake_push_check_state()
more, other tidy-upscheck_include_file_concat()
for LDAP and GSS detection
vszakats
added a commit
to vszakats/curl
that referenced
this pull request
Oct 12, 2024
Regression from rebase mistake in 91d451b curl#15157
vszakats
added a commit
to vszakats/curl
that referenced
this pull request
Oct 12, 2024
Regression from rebase mistake in 91d451b curl#15157
vszakats
added a commit
that referenced
this pull request
Oct 12, 2024
- limit `SIZEOF_SA_FAMILY_T` detection to non-Windows. - make sure `sys/socket.h` exists before detecting `SIZEOF_SA_FAMILY_T`. - limit `mach_absolute_time()` detection to `APPLE`. Drop from Windows pre-cache. - skip `HAVE_LIBSOCKET` detection for Windows, drop pre-cached value. - drop redundant pre-cached `HAVE_LIBZ` for Windows. - `curl_required_libpaths()`: stop accepting multiple arguments. To prepare for `CMAKE_REQUIRED_LINK_DIRECTORIES` support. Follow-up to 7bab201 #15193 - GSS: fix recent rebase mistakes: - fix variable name. - do not add a header twice. Follow-up to 91d451b #15157 - GSS: quote a variable. Closes #15271
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.
Replace
check_include_file_concat()
withcheck_include_file()
inGSS/LDAP detection to avoid these headers spilling into subsequent
feature checks.
For LDAP, reverse detection order to match with
./configure
.Though, in current LDAP packages
ldap.h
does includelber.h
.For GSS, align header detection logic with
./configure
, wheregssapi/gssapi_generic.h
might requiregssapi/gssapi.h
, andgssapi/gssapi_krb5.h
might require both.Ref: #436
ldap
tolibcurl.pc
Requires:
#15163