cmake: modules: version: Check that required fields are present #99188
+33
−8
Conversation
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
Will throw an error showing what the issue with the VERSION file is if a required field is missing Signed-off-by: Jamie McCrae <[email protected]>
nordicjm
force-pushed
the
versioncheck
branch
from
7a280e4 to
d928f88
Compare
|
tejlmand
requested changes
Nov 11, 2025
Comment on lines
+54
to
+57
| set(${type}_VERSION_MAJOR_LENGTH 0) | ||
| set(${type}_VERSION_MINOR_LENGTH 0) | ||
| set(${type}_PATCHLEVEL_LENGTH 0) | ||
| set(${type}_VERSION_TWEAK_LENGTH 0) |
Contributor
There was a problem hiding this comment.
why this complexity (also code below) ?
Suggested change
| set(${type}_VERSION_MAJOR_LENGTH 0) | |
| set(${type}_VERSION_MINOR_LENGTH 0) | |
| set(${type}_PATCHLEVEL_LENGTH 0) | |
| set(${type}_VERSION_TWEAK_LENGTH 0) |
| # Validate all version fields fit in a single byte | ||
| if(${type}_VERSION_MAJOR GREATER 255) | ||
| message(FATAL_ERROR "VERSION_MAJOR must be in the range 0-255 (Current ${${type}_VERSION_MAJOR})") | ||
| if(${type}_VERSION_MAJOR_LENGTH EQUAL 0 OR ${type}_VERSION_MAJOR GREATER 255) |
Contributor
There was a problem hiding this comment.
If field is not defined, then CMAKE_MATCH_1 will be empty and thus the <type>_VERSION_x is not defined.
So this should be sufficient:
Suggested change
| if(${type}_VERSION_MAJOR_LENGTH EQUAL 0 OR ${type}_VERSION_MAJOR GREATER 255) | |
| if(NOT DEFINED ${type}_VERSION_MAJOR OR ${type}_VERSION_MAJOR GREATER 255) |
and avoid all the LENGTH handling above.
Comment applies to below code lines also.
Comment on lines
+62
to
+65
| if(DEFINED ${type}_VERSION_MAJOR) | ||
| string(LENGTH ${${type}_VERSION_MAJOR} ${type}_VERSION_MAJOR_LENGTH) | ||
| endif() | ||
|
|
Contributor
There was a problem hiding this comment.
Suggested change
| if(DEFINED ${type}_VERSION_MAJOR) | |
| string(LENGTH ${${type}_VERSION_MAJOR} ${type}_VERSION_MAJOR_LENGTH) | |
| endif() |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Will throw an error showing what the issue with the VERSION file is if a required field is missing