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

Ubuntu's capnp-dev package is missing targets #1659

Merged
merged 1 commit into from
Jun 11, 2020

Conversation

Shelnutt2
Copy link
Member

We need to handle a capnproto install without targets by checking for the CAPNP_LIBRARIES and making sure all needed libraries are available. Ubuntu 18.04's capnproto 0.6.1 package is missing the libcapnp-json so we need to use super build in that case.

Note: This does not solve the problem of checking for capnproto version mismatches. I'll open a story to do this as a followup.

This is based on #1658 to avoid rebase conflicts. I'll rebase once that one is merged.

[ch2388]

@Shelnutt2 Shelnutt2 requested a review from ihnorton May 27, 2020 22:32
@Shelnutt2 Shelnutt2 force-pushed the ss/adjust-findcapnp_ep-for-ubuntu branch from 30b0964 to 9641d73 Compare May 28, 2020 12:29
cmake/Modules/FindCapnp_EP.cmake Outdated Show resolved Hide resolved
@Shelnutt2 Shelnutt2 force-pushed the ss/adjust-findcapnp_ep-for-ubuntu branch 2 times, most recently from 2adcf67 to cfc1003 Compare May 28, 2020 19:42
@Shelnutt2 Shelnutt2 added backport tags commits to backport to release branch build cmake labels May 28, 2020
@Shelnutt2 Shelnutt2 force-pushed the ss/adjust-findcapnp_ep-for-ubuntu branch 3 times, most recently from b3bf113 to 21b8ab8 Compare May 30, 2020 12:21
@Shelnutt2 Shelnutt2 added backport release-2.0.4 and removed backport tags commits to backport to release branch labels Jun 10, 2020
We need to handle a capnproto install without targets by checking for
the CAPNP_LIBRARIES and making sure all needed libraries are available.
Ubuntu 18.04's capnproto 0.6.1 package is missing the libcapnp-json so
we need to use super build in that case.
@Shelnutt2 Shelnutt2 force-pushed the ss/adjust-findcapnp_ep-for-ubuntu branch from 21b8ab8 to 517a208 Compare June 10, 2020 23:32
@Shelnutt2 Shelnutt2 merged commit 8b5206c into dev Jun 11, 2020
@Shelnutt2 Shelnutt2 deleted the ss/adjust-findcapnp_ep-for-ubuntu branch June 11, 2020 01:40
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.

2 participants