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

Improved CMake configuration #137

Merged
merged 5 commits into from
Jan 8, 2023
Merged

Improved CMake configuration #137

merged 5 commits into from
Jan 8, 2023

Conversation

erlingrj
Copy link
Collaborator

@erlingrj erlingrj commented Jan 7, 2023

Mainly changing how reactor-c corelib is built. Originally it used add_subdirectory to add platform, modal, threaded and utils sources. This is a bit hacky since it creates new node and compile definitions and sources can not easily be added to the parent node. Now I use include instead. Needed some additional changes for this to work.

@erlingrj
Copy link
Collaborator Author

erlingrj commented Jan 7, 2023

Btw, @petervdonovan can you immediately see why the CI is not running on my PRs?

@petervdonovan
Copy link
Contributor

No, I'm not sure why not. I think that sometimes one has to merge master into the branch in order to trigger CI.

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.

This looks good to merge. Thanks for the cleanup!

@erlingrj
Copy link
Collaborator Author

erlingrj commented Jan 7, 2023

OK. Just have to fix the CI. @lhstrh. There is something wrong with the CI see here: https://github.com/lf-lang/reactor-c/actions/runs/3864134424/workflow

image

Do you understand anything of this?

@petervdonovan
Copy link
Contributor

petervdonovan commented Jan 7, 2023

Oh, I get it now. Dongha just forgot to change from auth back to master when merging #105, and the auth branch in lingua-franca has since been deleted. So if, in this PR, we just change auth back to master in reactor-c/.github/workflows/ci.yml, it should be fine again.

Actually, I'll just do that right now.

@erlingrj erlingrj merged commit b0a042d into main Jan 8, 2023
@lhstrh lhstrh changed the title Make improvements on CMake Improved CMake configuration Jan 26, 2023
@erlingrj erlingrj deleted the improve-cmake branch February 20, 2023 14:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants