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.

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

Ensure relocatable config files #129

Merged
merged 7 commits into from
Feb 4, 2021
Merged

Ensure relocatable config files #129

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
be2ca90
fix: Use PACKAGE_PREFIX_DIR to ensure relocatable CMake install for c…
Pro Nov 17, 2020
ae972ed
Merge branch 'ign-cmake2' into cmake-relocatable
chapulina Dec 22, 2020
e3c39ee
Merge branch 'ign-cmake2' into cmake-relocatable
scpeters Jan 8, 2021
1e39fa0
Compute ignition .pc file relative path to prefix
scpeters Jan 8, 2021
b95d20f
Compute path to prefix for ignition-cmake.pc
scpeters Jan 8, 2021
0aa4b64
Merge branch 'ign-cmake2' into cmake-relocatable
scpeters Jan 20, 2021
17215a7
Merge branch 'ign-cmake2' into cmake-relocatable
j-rivero Feb 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/ignition-config.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ foreach(component ${@PKG_NAME@_FIND_COMPONENTS})
endforeach()

# Specify the doxygen tag file
set(@PROJECT_NAME_NO_VERSION_UPPER@_DOXYGEN_TAGFILE "@CMAKE_INSTALL_PREFIX@/@IGN_DATA_INSTALL_DIR@/@PROJECT_NAME_LOWER@.tag.xml")
set(@PROJECT_NAME_NO_VERSION_UPPER@_DOXYGEN_TAGFILE "${PACKAGE_PREFIX_DIR}/@IGN_DATA_INSTALL_DIR@/@PROJECT_NAME_LOWER@.tag.xml")

# Specify the API url. This is where the doxygen tag file will resolve URLS to.
set(@PROJECT_NAME_NO_VERSION_UPPER@_API_URL "https://ignitionrobotics.org/api/@IGN_DESIGNATION@/@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@")
2 changes: 1 addition & 1 deletion cmake/pkgconfig/ignition.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
prefix=@CMAKE_INSTALL_PREFIX@
prefix=${pcfiledir}/../..
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as discussed in dartsim/dart#1527 (comment), this relative path is incorrect on Ubuntu

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated the .pc.in templates for downstream ignition packages in 1e39fa0 and the .pc file for ign-cmake2 itself in b95d20f

libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/ignition/@IGN_DESIGNATION@@PROJECT_VERSION_MAJOR@

Expand Down