configure: Don't emit _PRESENT macros #78
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
Patater
force-pushed
the
dev/Patater/no-present-macros
branch
2 times, most recently
from
bbe966d
to
3e28dba
Compare
rwalton-arm
reviewed
Oct 7, 2020
| @@ -47,7 +47,7 @@ def _render_mbed_config_cmake_template( | |||
| """ | |||
| env = jinja2.Environment(loader=jinja2.PackageLoader("mbed_tools.build", str(TEMPLATES_DIRECTORY)),) | |||
| template = env.get_template(TEMPLATE_NAME) | |||
| options = list(config.options.values()) | |||
| options = [x for x in config.options.values() if not x.key.endswith(".present")] | |||
There was a problem hiding this comment.
Would it not be better to apply this filtering where we create the config "options" here
? If not could we at least have a comment as to why we filter this and maybe aTODO to remove this when we refactor the mbed config?
There was a problem hiding this comment.
I'm not sure what refactoring of mbed config you have in mind here. Perhaps we should raise a GitHub issue for it?
There was a problem hiding this comment.
I meant refactoring of the mbed configuration system to remove these macros from the mbed_lib.json files.
Patater
force-pushed
the
dev/Patater/no-present-macros
branch
from
3e28dba
to
d2e6418
Compare
Do not put macros like MBED_CONF_FILESYSTEM_PRESENT or MBED_CONF_EVENTS_PRESENT into the applicaiton's generated mbed_config.cmake file. We will depend on Mbed OS CMake files for each of these components to define the _PRESENT macro in a target_compile_definitions() block for the e.g. filesystem or events CMake targets.
Patater
force-pushed
the
dev/Patater/no-present-macros
branch
from
d2e6418
to
9ffb7db
Compare
Patater
changed the title
hugueskamba
approved these changes
Oct 9, 2020
2 tasks
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.
Description
Do not put macros like MBED_CONF_FILESYSTEM_PRESENT or
MBED_CONF_EVENTS_PRESENT into the applicaiton's generated
mbed_config.cmake file. We will depend on Mbed OS CMake files for each
of these components to define the _PRESENT macro in a
target_compile_definitions() block for the e.g. filesystem or events
CMake targets.
This should be merged immediately before the Mbed OS companion PR is ready. Then, we should merge this PR, do a tools release, merge Mbed OS example PRs, and merge the Mbed OS PR. Without Mbed OS having updated CMake files, these tool changes will break some builds.
Test Coverage