[Backport v3.6-branch] cmake: fix issue with parsing version file located in /VERSION
#71499
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
Fixes: #71384 A VERSION file placed in `/` or `<drive>:\` was accidentally being picked up during `find_package(Zephyr)`. This happened because Zephyr loads the VERSION file to determine if it is the correct Zephyr to use. During initial phase of find_package(), then APPLICATION_SOURCE_DIR is not defined, causing one version file to be picked up from `/VERSION` instead of `<app>/VERSION`. `/VERSION` is outside any Zephyr repo, west workspace, or the application itself and therefore should not be picked up accidentally. Fix this be checking that APPLICATION_SOURCE_DIR is defined, and only when defined, look for a VERSION file there. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no> (cherry picked from commit 4959a02)
zephyrbot
added
Backport
zephyrbot
requested review from
57300,
jeremybettis,
nashif,
nordicjm and
tejlmand
nordicjm
approved these changes
Apr 25, 2024
tejlmand
approved these changes
Apr 30, 2024
henrikbrixandersen
approved these changes
Apr 30, 2024
MaureenHelm
approved these changes
May 1, 2024
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.
Backport 4959a02 from #71385.
Fixes: #71384