Remove multiply defined symbol from kvstore/securestore/mbed_lib.json #13312
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
This reverts commit 2e4cd86.
This reverts commit 97632f2.
function that checks TARGET_ keywords and if dir exists, it adds it to the path
creating util cmake to write up some functions we can use
Our current build system has some rules like TARGET_/FEATURE_ to select what is needed. We provide mbed_os_add_cmake_directory function that does the same trick.
If you have:
TARGET_ST/
TARGET_NXP
add CMakeLists.txt here and use this function to select proper target CMake inside these folders.
mbed_os_add_cmake_directory(TARGET, "${MBED_OS_TARGET_KEYS}")
This means, in this folder the selection is conditional based on TARGET and it checks TARGET_KEYS - they come from tools
CMake's _add_definitions() command requires each define begin with a -D or /D. Add -D to all definitions we want to add.
CMake's _add_definitions() command requires each define begin with a -D or /D. Add -D to all definitions we want to add.
Some parts of Mbed OS inspect "TOOLCHAIN_*" type macros. Add these defines to the per-toolchain files.
|
@rwalton-arm, thank you for your changes. |
We need config generation as part of the export, thus need to use tools from now on. Blinky was already updated.
CMake: Fix travis using tools
Use PR merge and check out it.
CMake: Fix travis checkout branch
rwalton-arm
force-pushed
the
dev/rwalton-arm/remove-multiply-defined-macro
branch
from
58ea2eb to
e895e21
Compare
rwalton-arm
changed the title
hugueskamba
force-pushed
the
feature-cmake
branch
2 times, most recently
from
11c243b to
f51723c
Compare
hugueskamba
force-pushed
the
feature-cmake
branch
from
ade9959 to
03449e9
Compare
|
This PR cannot be merged due to conflicts. Please rebase to resolve them. |
|
@rwalton-arm isn't this an issue on master where it should be fixed or only cmake branch? |
Yes, that's why I closed the PR. I'm raising a PR against master. |
|
Superseded by #13330 |
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.
Summary of changes
MBEDTLS_CMAC_Calready seems to be defined in https://github.com/ARMmbed/mbed-os/blob/master/features/mbedtls/inc/mbedtls/config.h#L2416 - this was causing warnings in CMake builds about multiple defined symbols.This patch removes the macro from the mbed_lib.json as it seems to be unnecessary.
Impact of changes
Migration actions required
Documentation
None
Pull request type
Test results
Reviewers