Fix cmake and version variable in build system #10109
Merged
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
Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
|
@Williangalvani Can you test it ? |
Williangalvani
approved these changes
Jan 11, 2022
akontsevich
reviewed
Jun 27, 2022
Comment on lines
+20
to
+21
| DEFINES -= APP_VERSION_STR=\"\\\"$$APP_VERSION_STR\\\"\" | ||
| DEFINES += APP_VERSION_STR=\"\\\"$$CUSTOM_QGC_VERSION\\\"\" |
There was a problem hiding this comment.
This does not work with qmake - build fails: main .pro/pri files still require GIT_VERSION. This works:
Suggested change
| DEFINES -= APP_VERSION_STR=\"\\\"$$APP_VERSION_STR\\\"\" | |
| DEFINES += APP_VERSION_STR=\"\\\"$$CUSTOM_QGC_VERSION\\\"\" | |
| DEFINES -= GIT_VERSION=\"\\\"$$GIT_VERSION\\\"\" | |
| DEFINES += GIT_VERSION=\"\\\"$$CUSTOM_QGC_VERSION\\\"\" | |
| DEFINES -= APP_VERSION_STR=\"\\\"$$APP_VERSION_STR\\\"\" | |
| DEFINES += APP_VERSION_STR=\"\\\"$$CUSTOM_QGC_VERSION\\\"\" |
There was a problem hiding this comment.
@patrickelectric please fix ☝️
patrickelectric
added a commit
to patrickelectric/qgroundcontrol
that referenced
this pull request
Jan 11, 2023
* custom-example: Update from GIT_VERSION to new APP_VERSION_STR Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com> * cmake: Fix usage of new variable APP_VERSION_STR over GIT_VERSION Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
patrickelectric
added a commit
that referenced
this pull request
Jan 13, 2023
* custom-example: Update from GIT_VERSION to new APP_VERSION_STR Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com> * cmake: Fix usage of new variable APP_VERSION_STR over GIT_VERSION Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
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.
No description provided.