[Backport 2.28] Pass MBEDTLS_CONFIG_FILE defines through cmake
#6974
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
3 tasks
davidhorstmann-arm
added
needs-review
When -DMBEDTLS_CONFIG_FILE or -DMBEDTLS_USER_CONFIG_FILE are passed to cmake, pass them through as compile definitions. This allows different mbedtls configs to be passed at configure time without modifying any cmake files. Signed-off-by: David Horstmann <david.horstmann@arm.com>
Signed-off-by: David Horstmann <david.horstmann@arm.com>
Signed-off-by: David Horstmann <david.horstmann@arm.com>
Signed-off-by: David Horstmann <david.horstmann@arm.com>
davidhorstmann-arm
force-pushed
the
2.28-cmake-pass-through-config-defines
branch
from
f6d1724 to
6762231
Compare
|
Rebased, one conflict on the addition of the |
For the MBEDTLS_CONFIG_FILE and MBEDTLS_USER_CONFIG_FILE variables, check that they are non-empty and defined. This means they can be unconditionally created in the cache, simplifying the CMakeLists.txt Signed-off-by: David Horstmann <david.horstmann@arm.com>
CMakeLists.txt
Outdated
| @@ -135,6 +135,14 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) | |||
| FORCE) | |||
| endif() | |||
|
|
|||
| # If set, make MBEDTLS_CONFIG_FILE and MBEDTLS_USER_CONFIG_FILE into PATHs | |||
| if(DEFINED MBEDTLS_CONFIG_FILE) | |||
There was a problem hiding this comment.
Do we need these if(DEFINED ...) blocks due to an older version of CMake?
There was a problem hiding this comment.
We do not, I had just forgotten to update the backport. This works the same way according to the docs I have for CMake 2.8.12, which is the oldest supported for this branch.
paul-elliott-arm
previously approved these changes
Jul 5, 2023
tom-cosgrove-arm
previously approved these changes
Jul 7, 2023
tom-cosgrove-arm
added
approved
|
OpenCI error is unrelated to this PR, and the corresponding Internal CI job passed, so CI is green |
Signed-off-by: David Horstmann <david.horstmann@arm.com>
davidhorstmann-arm
dismissed stale reviews from tom-cosgrove-arm and paul-elliott-arm
via
63b06a8
davidhorstmann-arm
removed
the
approved
davidhorstmann-arm
added
needs-review
paul-elliott-arm
added
the
approved
|
OpenCI break appears to be an internal problem. Internal CI passed, so all good. |
paul-elliott-arm
removed
needs-ci
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 of #6914.
Conflicts:
library/CMakeLists.txt- the code that adds include directories and definitions has changed between 2.28 and development.all.sh- 2.28 does not have the CMake as-package and as-package install tests.Gatekeeper checklist
MBEDTLS_CONFIG_FILEdefines through cmake #6914