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

Do not install CMake config files in a different directory on Windows #188

Merged
merged 1 commit into from
Dec 6, 2023

Conversation

traversaro
Copy link
Contributor

@traversaro traversaro commented Dec 4, 2023

A small cleanup that would make sense to get in urdfdom 4.

CMake config files were installed in a different directory in #41 as a workaround for a CMake issue on discoverability of packages installed in the default Windows install prefix (https://gitlab.kitware.com/cmake/cmake/issues/16212) that was fixed in CMake 3.7 (https://gitlab.kitware.com/cmake/cmake/-/merge_requests/68), so the workaround is not necessary when using CMake >= 3.7 (released ~7 years ago). Note that install on CMake <= 3.7 continues to work fine, the only thing that does not work is finding automatically a urdfdom installed in the default install prefix.

This PR removes the workaroud, and installs CMake config files in the same location for all OS, i.e. ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake . It is convenenient to have this merged before urdfdom 4 because:

fyi @clalancette

@traversaro traversaro changed the title Do not install CMake config files in a different directory Do not install CMake config files in a different directory on Windows Dec 4, 2023
@clalancette
Copy link
Contributor

I've rebased this onto the latest now that #186 is merged. Assuming the PR jobs above succeed, I'll also run ROS 2 CI on this.

@clalancette
Copy link
Contributor

CI:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status
  • Windows Debug Build Status

@clalancette clalancette merged commit 10093ba into ros:master Dec 6, 2023
6 checks passed
harleylara pushed a commit to traversaro/urdfdom that referenced this pull request Feb 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants