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

Use Zephyr's CMake extension to correctly build and link reactor-c #339

Merged
merged 10 commits into from
Jan 27, 2024

Conversation

erlingrj
Copy link
Collaborator

@erlingrj
Copy link
Collaborator Author

@petervdonovan would you mind taking a look at this since I believe you authored the CMake build system? There are two changes:

  1. I am changing the library name from core to reactor-c to avoid a naming collision with an ESP32 library called libcore.
  2. I am moving some Zephyr conditional building into this CMake lists. To make it work I would like to know if we are targeting Zephyr before we define the target (because for Zephyr we must use their Cmake extension). So thus, I gather all the sources in a list (you previously did this for debug printing) and add it to the target sources at the end. I also make a list for compile defs, currently it is only used for defining a PLATFORM_ZEPHYR. PLATFORM_NRF52 etc.

Copy link
Contributor

@petervdonovan petervdonovan left a comment

Choose a reason for hiding this comment

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

These changes look good and I have confidence that when the tests are passing this PR will be good enough to merge.

core/CMakeLists.txt Show resolved Hide resolved
@erlingrj
Copy link
Collaborator Author

Thanks Peter.

I updated the lf-ref back to master, it should work when the corresponding lingua-franca PR is through the merge queue.

@erlingrj erlingrj merged commit e11540e into main Jan 27, 2024
28 checks passed
@petervdonovan petervdonovan deleted the zephyr-esp-issue branch January 28, 2024 06:15
@lhstrh lhstrh added zephyr enhancement Enhancement of existing feature labels Apr 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Enhancement of existing feature zephyr
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants