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

GzConfigureProject: fix extras install #360

Merged
merged 1 commit into from
Jul 5, 2023

Conversation

scpeters
Copy link
Member

🦟 Bug fix

Needed by gazebosim/gz-transport#398, noticed while testing gazebo-release/gz-msgs10-release#3

Summary

We have been fixing the debian metadata for gz-msgs10 in gazebo-release/gz-msgs10-release#3, and I've built nightly debs from this branch successfully, but gz-transport fails to find the extra cmake files:

CMake Error at /usr/lib/x86_64-linux-gnu/cmake/gz-msgs10/gz-msgs10-config.cmake:226 (include):
  include could not find requested file:

    /usr/lib/x86_64-linux-gnu/cmake/gz-msgs10/gz-msgs-extras.cmake
Call Stack (most recent call first):
  /usr/share/cmake/gz-cmake3/cmake3/GzFindPackage.cmake:243 (find_package)
  CMakeLists.txt:87 (gz_find_package)

Looking at the location of installed cmake files in libgz-msgs10-dev:

/usr/lib/cmake/gz-msgs10/gz-msgs-extras.cmake
/usr/lib/cmake/gz-msgs10/gz_msgs_factory.cmake
/usr/lib/cmake/gz-msgs10/gz_msgs_generate.cmake
/usr/lib/cmake/gz-msgs10/gz_msgs_protoc.cmake
/usr/lib/cmake/gz-msgs10/gz_msgs_string_utils.cmake
/usr/lib/cmake/gz-msgs10/target_link_messages.cmake
/usr/lib/x86_64-linux-gnu
/usr/lib/x86_64-linux-gnu/cmake
/usr/lib/x86_64-linux-gnu/cmake/gz-msgs10
/usr/lib/x86_64-linux-gnu/cmake/gz-msgs10/gz-msgs10-config-version.cmake
/usr/lib/x86_64-linux-gnu/cmake/gz-msgs10/gz-msgs10-config.cmake
/usr/lib/x86_64-linux-gnu/cmake/gz-msgs10/gz-msgs10-targets-relwithdebinfo.cmake
/usr/lib/x86_64-linux-gnu/cmake/gz-msgs10/gz-msgs10-targets.cmake
/usr/lib/x86_64-linux-gnu/cmake/gz-msgs10-all
/usr/lib/x86_64-linux-gnu/cmake/gz-msgs10-all/gz-msgs10-all-config-version.cmake
/usr/lib/x86_64-linux-gnu/cmake/gz-msgs10-all/gz-msgs10-all-config.cmake
/usr/lib/x86_64-linux-gnu/cmake/gz-msgs10-all/gz-msgs10-all-targets.cmake
/usr/lib/x86_64-linux-gnu/cmake/gz-msgs10-compiled
/usr/lib/x86_64-linux-gnu/cmake/gz-msgs10-compiled/gz-msgs10-compiled-config-version.cmake
/usr/lib/x86_64-linux-gnu/cmake/gz-msgs10-compiled/gz-msgs10-compiled-config.cmake
/usr/lib/x86_64-linux-gnu/cmake/gz-msgs10-compiled/gz-msgs10-compiled-targets-relwithdebinfo.cmake
/usr/lib/x86_64-linux-gnu/cmake/gz-msgs10-compiled/gz-msgs10-compiled-targets.cmake

This changes the install location of the extra cmake files to use the CMAKE_INSTALL_LIBDIR variable, so that it matches the installation of the cmake config files.

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.

The changes the install location of the extra cmake files
to use the CMAKE_INSTALL_LIBDIR variable, so that it
matches the installation of the cmake config files. This
fixes an issue when building debian packages.

Signed-off-by: Steve Peters <[email protected]>

Signed-off-by: Steve Peters <[email protected]>
@scpeters
Copy link
Member Author

scpeters commented Jul 5, 2023

I have found more issues, but I will open separate PRs for them

@scpeters scpeters merged commit 3c22e2c into gz-cmake3 Jul 5, 2023
@scpeters scpeters deleted the scpeters/fix_extras_install branch July 5, 2023 23:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden 🎵 harmonic Gazebo Harmonic
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants