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

Jump to bottom

ARM FM: refactor CMake targets #14246

Merged
merged 5 commits into from Feb 15, 2021
Merged

ARM FM: refactor CMake targets #14246

merged 5 commits into from Feb 15, 2021

Conversation

0xc0170
Copy link
Contributor

@0xc0170 0xc0170 commented Feb 8, 2021

CMake targets follow Mbed OS targets structure.

Summary of changes

Impact of changes

Migration actions required

Documentation

Pull request type 

[x] Patch update (Bug fix / Target update / Docs update / Test update / Refactor)
[] Feature update (New feature / Functionality change / New API)
[] Major update (Breaking change E.g. Return code change / API behaviour change)

Test results 

[x] No Tests required for this change (E.g docs only update)
[] Covered by existing mbed-os tests (Greentea or Unittest)
[] Tests / results supplied as part of this PR

Reviewers

@ciarmcom ciarmcom added the release-type: patch Indentifies a PR as containing just a patch label Feb 8, 2021
@ciarmcom
Copy link
Member

ciarmcom commented Feb 8, 2021

@0xc0170, thank you for your changes.
@ARMmbed/mbed-os-test @ARMmbed/mbed-os-maintainers please review.

@ciarmcom ciarmcom requested review from a team February 8, 2021 17:00
hugueskamba
hugueskamba previously requested changes Feb 11, 2021
View reviewed changes
Copy link
Collaborator

@hugueskamba hugueskamba left a comment •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please rename CMake target names to follow the convention so they are picked up by CMake.

@0xc0170
Copy link
Contributor Author

0xc0170 commented Feb 11, 2021

Rebased, fixed the naming.

@mergify mergify bot dismissed hugueskamba’s stale review February 11, 2021 14:49

Pull request has been modified.

hugueskamba
hugueskamba reviewed Feb 11, 2021
View reviewed changes
targets/TARGET_ARM_FM/TARGET_FVP_MPS2/CMakeLists.txt
@@ -106,6 +35,4 @@ target_sources(mbed-core
drivers/lan91c111.c

SDK/fpga.c
${SYSTEM_FILE}
${STARTUP_FILE}
)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please link mbed-fvp-mps2 with mbed-arm-fm here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/CMakelists.txt Outdated Show resolved Hide resolved
targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/CMakelists.txt Outdated Show resolved Hide resolved
targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/CMakelists.txt Outdated Show resolved Hide resolved
targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/CMakelists.txt Outdated Show resolved Hide resolved
targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/CMakelists.txt Outdated Show resolved Hide resolved
targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/CMakelists.txt Outdated Show resolved Hide resolved
0xc0170 and others added 2 commits February 14, 2021 19:43
@0xc0170 @hugueskamba
CMake Arm FM: fix linking libraries with arm-fm
26d7b4d 
Co-authored-by: Hugues Kamba-Mpiana <41612201+hugueskamba@users.noreply.github.com>
@0xc0170
CMake fvp mps2: fix linking to arm-fm
950baa2
@0xc0170
Copy link
Contributor Author

0xc0170 commented Feb 14, 2021

Fixed all comments

@mbed-ci
Copy link

mbed-ci commented Feb 14, 2021

Jenkins CI Test : ✔️ SUCCESS

Build Number: 1 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

CLICK for Detailed Summary

jobs Status
jenkins-ci/mbed-os-ci_unittests ✔️
jenkins-ci/mbed-os-ci_cmake-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_cmake-example-ARM ✔️
jenkins-ci/mbed-os-ci_build-greentea-ARM ✔️
jenkins-ci/mbed-os-ci_build-greentea-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-cloud-example-ARM ✔️
jenkins-ci/mbed-os-ci_build-cloud-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-example-ARM ✔️
jenkins-ci/mbed-os-ci_build-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_cmake-example-test ✔️
jenkins-ci/mbed-os-ci_greentea-test ✔️

hugueskamba
hugueskamba previously requested changes Feb 15, 2021
View reviewed changes
Copy link
Collaborator

@hugueskamba hugueskamba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please rename the files from CMakelists.txt to CMakeLists.txt

@0xc0170
Copy link
Contributor Author

0xc0170 commented Feb 15, 2021

Fixed all names

@mergify mergify bot dismissed hugueskamba’s stale review February 15, 2021 09:24

Pull request has been modified.

@0xc0170
Copy link
Contributor Author

0xc0170 commented Feb 15, 2021

CI started

@mbed-ci
Copy link

mbed-ci commented Feb 15, 2021

Jenkins CI Test : ✔️ SUCCESS

Build Number: 2 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

CLICK for Detailed Summary

jobs Status
jenkins-ci/mbed-os-ci_unittests ✔️
jenkins-ci/mbed-os-ci_cmake-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-greentea-ARM ✔️
jenkins-ci/mbed-os-ci_build-cloud-example-ARM ✔️
jenkins-ci/mbed-os-ci_cmake-example-ARM ✔️
jenkins-ci/mbed-os-ci_build-cloud-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-greentea-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-example-ARM ✔️
jenkins-ci/mbed-os-ci_cmake-example-test ✔️
jenkins-ci/mbed-os-ci_greentea-test ✔️

@0xc0170 0xc0170 merged commit 24c9d24 into ARMmbed:master Feb 15, 2021
@mergify mergify bot removed the ready for merge label Feb 15, 2021
@0xc0170 0xc0170 deleted the cmake-refactor-arm-fm branch February 15, 2021 11:02
@mbedmain mbedmain added release-version: 6.8.0 Release-pending and removed release-type: patch Indentifies a PR as containing just a patch Release-pending labels Feb 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hugueskamba hugueskamba hugueskamba approved these changes

@rajkan01 rajkan01 Awaiting requested review from rajkan01

Assignees
No one assigned
Labels
release-version: 6.8.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@0xc0170 @ciarmcom @mbed-ci @hugueskamba @mbedmain