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

Upgrade to Conan 2 #55

Merged
merged 5 commits into from
Apr 17, 2024
Merged

Upgrade to Conan 2 #55

merged 5 commits into from
Apr 17, 2024

Conversation

kyllingstad
Copy link
Member

Fixes #54.

This depends on open-simulation-platform/libcosim#747. (Once that PR has been merged, the version specification of the libcosim requirement should be changed so it no longer points to the osp/testing-feature... branch.)

I've added shared and fPIC options, which seem to be rather standard for library packages these days. (Previously, we only built the shared library version.)

@kyllingstad kyllingstad added the enhancement New feature or request label Nov 24, 2023
@kyllingstad kyllingstad self-assigned this Nov 24, 2023
@kyllingstad kyllingstad marked this pull request as draft February 22, 2024 09:41
@kyllingstad
Copy link
Member Author

I got some build errors related to Boost.Fibers that I couldn't quite figure out, so rather than try to fix them, I simply removed the explicit dependency on Boost. Libcosim no longer uses Boost.Fibers, and everything we used it for here could be done with stdlib functionality from <future>, so I think this is a net win.

Note that there is still an implicit dependency on Boost, and this PR depends on open-simulation-platform/libcosim#753, which should be merged first.

@kyllingstad kyllingstad marked this pull request as ready for review February 22, 2024 14:54
@kyllingstad kyllingstad merged commit 305246c into master Apr 17, 2024
16 checks passed
@kyllingstad kyllingstad deleted the feature/conan-2 branch April 17, 2024 08:44
requires = (
"libcosim/0.10.2@osp/stable"
)
"libcosim/0.10.3@osp/testing-bugfix_transitive-libs-boost",
Copy link
Member

Choose a reason for hiding this comment

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

Maybe this have been changed to libcosim/0.10.3@osp/stable before merging.

Copy link
Member Author

@kyllingstad kyllingstad Apr 17, 2024

Choose a reason for hiding this comment

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

Oops! I've pushed a hotfix to master now. (Please give it a quick check.)

Copy link
Member Author

Choose a reason for hiding this comment

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

Looks like my hotfix broke master. :( I guess the issue is that the upstream fix in open-simulation-platform/libcosim#753 is in libcosim master, but not in any release yet, so it's not in the stable channel. I don't know what the right way to fix this is. Revert all changes to libcosimc master and reopen this PR again, or make libcosimc master depend on the libcosim testing channel which tracks the master branch?

@kyllingstad kyllingstad restored the feature/conan-2 branch April 18, 2024 05:54
kyllingstad added a commit that referenced this pull request Apr 18, 2024
kyllingstad added a commit that referenced this pull request Apr 18, 2024
@kyllingstad kyllingstad mentioned this pull request Apr 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update to Conan 2
2 participants