cmake: tidy-ups and rebase fixups - #15271
Closed
vszakats wants to merge 11 commits into
Closed
Conversation
Weird hack required to make the foreach() loop work inside a macro.
Contributor
|
Analysis of PR #15271 at 1fd24803: Test 3000 failed, which has NOT been flaky recently, so there could be a real issue in this PR. Generated by Testclutch |
Regression from rebase mistake in 91d451b curl#15157
1 task
vszakats
added a commit
that referenced
this pull request
Dec 16, 2024
Use `CMAKE_REQUIRED_LINK_DIRECTORIES` with CMake 3.31.0 and upper, in local macro `curl_required_libpaths()`. Kitware/CMake@9e95bd4 https://gitlab.kitware.com/cmake/cmake/-/commit/9e95bd49f278cd2a05caf21fd624a41e4bfaba60 https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9795 https://cmake.org/cmake/help/v3.31/module/CheckSymbolExists.html Tested OK with cmake 3.31.0-rc1. Follow-up to 01a8157 #15271 Follow-up to 7bab201 #15193 Closes #15280
pps83
pushed a commit
to pps83/curl
that referenced
this pull request
Apr 26, 2025
- 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 curl#15193 - GSS: fix recent rebase mistakes: - fix variable name. - do not add a header twice. Follow-up to 91d451b curl#15157 - GSS: quote a variable. Closes curl#15271
pps83
pushed a commit
to pps83/curl
that referenced
this pull request
Apr 26, 2025
Use `CMAKE_REQUIRED_LINK_DIRECTORIES` with CMake 3.31.0 and upper, in local macro `curl_required_libpaths()`. Kitware/CMake@9e95bd4 https://gitlab.kitware.com/cmake/cmake/-/commit/9e95bd49f278cd2a05caf21fd624a41e4bfaba60 https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9795 https://cmake.org/cmake/help/v3.31/module/CheckSymbolExists.html Tested OK with cmake 3.31.0-rc1. Follow-up to 01a8157 curl#15271 Follow-up to 7bab201 curl#15193 Closes curl#15280
This file contains hidden or 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
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.
SIZEOF_SA_FAMILY_Tdetection to non-Windows.sys/socket.hexists before detectingSIZEOF_SA_FAMILY_T.mach_absolute_time()detection toAPPLE. Drop from Windowspre-cache.
HAVE_LIBSOCKETdetection for Windows, drop pre-cached value.HAVE_LIBZfor Windows.curl_required_libpaths(): stop accepting multiple arguments.To prepare for
CMAKE_REQUIRED_LINK_DIRECTORIESsupport.Follow-up to 7bab201 cmake: add native
pkg-configdetection for mbedTLS, MSH3, Quiche, Rustls, wolfSSL #15193Follow-up to 91d451b cmake: replace
check_include_file_concat()for LDAP and GSS detection #15157w/o whitespace: https://github.com/curl/curl/pull/15271/files?w=1