cmake: use numeric comparison for HAVE_WIN32_WINNT#14409
Closed
vszakats wants to merge 1 commit intocurl:masterfrom
Closed
cmake: use numeric comparison for HAVE_WIN32_WINNT#14409vszakats wants to merge 1 commit intocurl:masterfrom
HAVE_WIN32_WINNT#14409vszakats wants to merge 1 commit intocurl:masterfrom
Conversation
Turns out CMake supports numeric comparison with hexadecimal values. Confirmed in GHA/linux-old with CMake 3.7.2. I could not find documentation about this, but our CMakeLists.txt already used it before this patch. Extend that method to two more comparisons. Also pad the value in the existing one to 4 digits. The padding/lowercasing logic when setting `HAVE_WIN32_WINNT` is no longer required, but keep it anyway for uniform log output. Follow-up to 2100d9f curl#12044 Closes #xxxxx
MarcelRaad
approved these changes
Aug 6, 2024
vszakats
added a commit
to vszakats/curl
that referenced
this pull request
Aug 7, 2024
- unquote numeric value.
- replace macro with variable name.
It also avoids this error when the variable is undefined:
```
CMake Error at CMakeLists.txt:1529 (if):
if given arguments:
"GREATER" "4"
Unknown arguments specified
```
https://github.com/curl/curl/actions/runs/10289921657/job/28478722584#step:30:356
Follow-up to 72ae0d8 curl#14409
Follow-up to acbc6b7 curl#14197
Closes #xxxxx
vszakats
added a commit
that referenced
this pull request
Aug 7, 2024
- unquote numeric value.
- `NOT LESS` -> `GREATER_EQUAL`.
- replace macro with variable name.
It also avoids this error when the variable is undefined:
```
CMake Error at CMakeLists.txt:1529 (if):
if given arguments:
"GREATER" "4"
Unknown arguments specified
```
https://github.com/curl/curl/actions/runs/10289921657/job/28478722584#step:30:356
Follow-up to 72ae0d8 #14409
Follow-up to acbc6b7 #14197
Closes #14449
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
2 participants
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.
Turns out CMake supports numeric comparison with hexadecimal values.
Confirmed in GHA/linux-old with CMake 3.7.2. I could not find
documentation about this, but our CMakeLists.txt already used it before
this patch.
Extend that method to two more comparisons.
Also pad the value in the existing one to 4 digits.
The padding/lowercasing logic when setting
HAVE_WIN32_WINNTis nolonger required, but keep it anyway for uniform log output.
Follow-up to 2100d9f #12044
Closes #14409