cmake: fix generation for system name iOS #12515
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
7 tasks
vszakats
reviewed
Dec 14, 2023
vszakats
approved these changes
Dec 14, 2023
BoscoBecker
reviewed
Dec 15, 2023
|
Thank you, merged now! |
vszakats
added a commit
to vszakats/curl
that referenced
this pull request
May 19, 2024
Follow-up to a86254b curl#12515 Closes #xxxxx
vszakats
added a commit
that referenced
this pull request
Aug 29, 2024
Drop Apple-specific detection logic for `poll()`. This detection snippet has been disabled for Apple in both configure and cmake, for `poll()` being broken on Apple since 10.12 Sierra (2016). Also replace `exit(1);` with `return 1;` in configure, to make the snippets match. Added in 9297ca4 #1057 (2016-10-11). Disabled for: configure/darwin in a34c7ce (2016-10-18) cmake/macOS in 825911b #7619 cmake/iOS in d148312 #8244 cmake/all Apple in a86254b #12515 Closes #14718
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.
This PR fixes a problem that happens during CMake configuration when the
CMAKE_SYSTEM_NAMEset toiOSand notDarwin. This value is available (as far as I remember) version 3.14. The final solution (thanks to @vszakats) is to useAPPLEwhich contains all the Apple platforms https://cmake.org/cmake/help/latest/variable/APPLE.html.This issue was found when during vcpkg installation. Running command
vcpkg install curl:arm64-iosandvcpkg install curl:x64-iosfailed with messageAfter this fix, I was able to compile the compile the binary without any issue.
In addition to that fix, this PR also contains an simplification to check if the platform is not APPLE.
Thank you very much for reviewing!