cmake: tfm: moving CMake execution of tfm_cmake to a custom command #36183
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: zephyrproject-rtos#36101 The move of CMake invocation to a dedicated custom target, see zephyrproject-rtos#34868 results in tfm_cmake to always be considered out-of-date, causing CMake to be reinvoked in the TF-M Binary dir, which again results in the build command to rebuild. This commit moves the invocation to a custom command with the CMakeCache.txt as output. The custom target tfm_cmake is updated to depend on CMakeCache.txt. This mean that CMake for TF-M will only be invoked inside the Zephyr build command if that file is missing. If the CMakeCache.txt file is updated or TF-M CMake or source code is modified, then the build command inside the TF-M build folder will ensure correct re-run of CMake from within the TF-M build folder. This ensures that TF-M will still rebuild if TF-M code is modified, while at the same time avoid unnecessary rebuilds of TF-M code. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
682f1fd to
98f2cd2
Compare
ioannisg
approved these changes
Jun 11, 2021
galak
approved these changes
Jun 11, 2021
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.
Fixes: #36101
The move of CMake invocation to a dedicated custom target, see #34868
results in tfm_cmake to always be considered out-of-date, causing CMake
to be reinvoked in the TF-M Binary dir, which again results in the
build command to rebuild.
This commit moves the invocation to a custom command with the
CMakeCache.txt as output. The custom target tfm_cmake is updated to
depend on CMakeCache.txt.
This mean that CMake for TF-M will only be invoked inside the Zephyr build
command if that file is missing.
If the CMakeCache.txt file is updated or TF-M CMake or source code is
modified, then the build command inside the TF-M build folder will
ensure correct re-run of CMake from within the TF-M build folder.
This ensures that TF-M will still rebuild if TF-M code is modified,
while at the same time avoid unnecessary rebuilds of TF-M code.
Signed-off-by: Torsten Rasmussen Torsten.Rasmussen@nordicsemi.no