The Wayback Machine - https://web.archive.org/web/20201109182216/https://github.com/ARMmbed/mbedtls/pull/3790
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add fix for cmake control of CMAKE_BUILD_TYPE only if mbedtls is the root project #3790

Merged

Conversation

@peter-toft-greve
Copy link

@peter-toft-greve peter-toft-greve commented Oct 14, 2020

The current CMakeLists.txt has problems when making integration to other projects also running cmake.
The current code traverses the CMAKE_BUILD_TYPE to the mother project, which can be anything - thus clearly problematic.
Especially if the mother project has their own sanitizers setup the current code invalidates that from the mother project.

With the patch the code will let the project using mbedtls control the build types.

Solves: #3789
Signed-off-by: peter-toft-greve

…root project

Signed-off-by: Peter Toft <[email protected]>
@paul-elliott-arm
Copy link
Contributor

@paul-elliott-arm paul-elliott-arm commented Oct 14, 2020

Could you copy the description from the commit message into the description here?

@peter-toft-greve
Copy link
Author

@peter-toft-greve peter-toft-greve commented Oct 14, 2020

@paul-elliott-arm I have tried to update. Let me know if you suggest changes (or just update).
Thanx for the help

@peter-toft-greve
Copy link
Author

@peter-toft-greve peter-toft-greve commented Oct 14, 2020

BTW, if you want this PR, feel free to merge this in at the time it fits your work schedule and release cycle - or tell me so 👍
Thanx for a great project.

@daverodgman daverodgman self-requested a review Oct 15, 2020
@paul-elliott-arm paul-elliott-arm self-requested a review Oct 15, 2020
Copy link
Contributor

@paul-elliott-arm paul-elliott-arm left a comment

This looks good to me

@peter-toft-greve
Copy link
Author

@peter-toft-greve peter-toft-greve commented Oct 15, 2020

@paul-elliott-arm two questions;

  • should I - or will you - merge when/if @daverodgman also approves?
  • you labelled this with "backports" - anything I need to do regarding this?
@paul-elliott-arm
Copy link
Contributor

@paul-elliott-arm paul-elliott-arm commented Oct 15, 2020

  • should I - or will you - merge when/if @daverodgman also approves?
    If approval is given, we will merge this, no worries
  • you labelled this with "backports" - anything I need to do regarding this?
    I previously labelled this with backports as I was seeing as a bug and thus would need backporting to our LTS branches, however on reflection this is more of an enhancement, and generally we do not backport those.
@peter-toft-greve
Copy link
Author

@peter-toft-greve peter-toft-greve commented Oct 22, 2020

@paul-elliott-arm others that can review?

@paul-elliott-arm
Copy link
Contributor

@paul-elliott-arm paul-elliott-arm commented Oct 22, 2020

@paul-elliott-arm others that can review?

Its on the board in the right place, I am afraid we will need to wait for people to get the time to review it. Given its only a small patch, hopefully this won't take too long.

@d3zd3z
d3zd3z approved these changes Oct 22, 2020
Copy link
Contributor

@d3zd3z d3zd3z left a comment

This is typically how this is done in CMake for other projects.

@paul-elliott-arm paul-elliott-arm moved this from To Do to Has Approval in Mbed TLS Unified Board Oct 29, 2020
Copy link
Contributor

@paul-elliott-arm paul-elliott-arm left a comment

I am happy with this too, it makes sense from my understanding.

@gilles-peskine-arm
Copy link
Contributor

@gilles-peskine-arm gilles-peskine-arm commented Oct 30, 2020

The failure in pr-merge is a network glitch. Since the same job passed in earlier runs with the same content, this is as good as a pass.

@gilles-peskine-arm gilles-peskine-arm merged commit 2da4292 into ARMmbed:development Oct 30, 2020
8 of 10 checks passed
8 of 10 checks passed
PR-3790-merge TLS Testing Failures: all_sh-ubuntu-16.04-check_changelog
Details
continuous-integration/jenkins/pr-merge This commit is being built
Details
DCO DCO
Details
PR-3790-head Pre Test Checks OK
Details
PR-3790-head Result analysis OK
Details
PR-3790-head TLS Testing All tests passed
Details
PR-3790-merge Pre Test Checks OK
Details
PR-3790-merge Result analysis OK
Details
continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Mbed TLS Unified Board automation moved this from Has Approval to Done Oct 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.