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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Look for vulkan in CMakeLists #782

Merged
merged 3 commits into from
Dec 12, 2022
Merged

Look for vulkan in CMakeLists #782

merged 3 commits into from
Dec 12, 2022

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Dec 9, 2022

Signed-off-by: Ian Chen ichen@osrfoundation.org

馃 Bug fix

Summary

Make sure vulkan exists before building ogre2. This is needed by Jammy after #706 introduced the vulkan/vulkan_core.h include header. Otherwise build fails.

We should only just need the vulkan headers and not the whole library. Alternative solution is to manually search for vulkan_core.h using FIND_PATH in cmake. I went with gz_find_package for simplicity as the headers are installed with the library when you do apt install libvulkan-dev

  • Update: ended up using find_path to look for vulkan headers and adding more logic to make sure ogre-next is built with vulkan support

Note that the libvulkan-dev dependency has already been added to packages-jammy.apt and our Jammy debbuild CI script.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

Signed-off-by: Ian Chen <ichen@osrfoundation.org>
@osrf-triage osrf-triage added this to Inbox in Core development Dec 9, 2022
@iche033 iche033 marked this pull request as draft December 9, 2022 23:49
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
@codecov
Copy link

codecov bot commented Dec 10, 2022

Codecov Report

Merging #782 (a06f079) into main (4762f85) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main     #782   +/-   ##
=======================================
  Coverage   76.48%   76.48%           
=======================================
  Files         167      167           
  Lines       15099    15099           
=======================================
  Hits        11548    11548           
  Misses       3551     3551           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Signed-off-by: Ian Chen <ichen@osrfoundation.org>
@iche033 iche033 marked this pull request as ready for review December 10, 2022 04:25
Core development automation moved this from Inbox to In review Dec 12, 2022
@mjcarroll mjcarroll merged commit 56ba0b1 into main Dec 12, 2022
Core development automation moved this from In review to Done Dec 12, 2022
@mjcarroll mjcarroll deleted the find_vulkan branch December 12, 2022 14:12
@iche033 iche033 added the 馃幍 harmonic Gazebo Harmonic label Feb 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
馃幍 harmonic Gazebo Harmonic
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

3 participants