Skip to content

Fix Corrade detection and build failures with GCC 11 #130

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.

Sign up for GitHub

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
Merged
weyrick merged 5 commits into from
Oct 22, 2021
Merged

Fix Corrade detection and build failures with GCC 11 #130

weyrick merged 5 commits into from
Oct 22, 2021

Conversation

@fcelda
Copy link
Contributor

@fcelda fcelda commented Oct 22, 2021

  • I've updated FindCorrade.cmake from upstream and added a small patch to make it work with the library installed by Conan. The problem is that Conan installs Corrade cmake files into lib/cmake and the official FindCorrade.cmakes looks for them in share/cmake/Corrade.
  • I've bumped benchmark and Catch2 because these no longer build with GCC 11.
  • I've added missing mutex include (for std::unique_lock) to fix build with GCC 11.

@weyrick weyrick merged commit 33b22c0 into develop Oct 22, 2021
@weyrick weyrick deleted the fix-corrade-dep-and-gcc11 branch October 22, 2021 13:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@weyrick weyrick weyrick approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@fcelda @weyrick