Skip to content

Commit

Permalink
Use relative paths for pkg-config install directory (#443)
Browse files Browse the repository at this point in the history
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
  • Loading branch information
azeey authored Aug 16, 2024
1 parent bc2a430 commit ec85d5f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
5 changes: 3 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ set(gz_version_output "${PROJECT_NAME_LOWER}-config-version.cmake")
set(gz_config_install_dir "${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME_LOWER}")
set(gz_pkgconfig_input "${CMAKE_CURRENT_SOURCE_DIR}/config/gz-cmake.pc.in")
set(gz_pkgconfig_output "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc")
set(gz_pkgconfig_install_dir "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
set(gz_pkgconfig_install_dir "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
set(gz_pkgconfig_abs_install_dir "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
set(gz_utilities_target ${PROJECT_EXPORT_NAME}-utilities)
set(gz_utilities_import_target_name ${PROJECT_EXPORT_NAME}::${gz_utilities_target})
set(gz_utilities_target_output_filename "${gz_utilities_target}-targets.cmake")
Expand Down Expand Up @@ -96,7 +97,7 @@ install(
# Configure and install the pkgconfig file (needed for utilities headers)
file(RELATIVE_PATH
GZ_PC_CONFIG_RELATIVE_PATH_TO_PREFIX
"${gz_pkgconfig_install_dir}"
"${gz_pkgconfig_abs_install_dir}"
"${CMAKE_INSTALL_PREFIX}"
)

Expand Down
5 changes: 3 additions & 2 deletions cmake/GzPackaging.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,11 @@ function(_gz_create_pkgconfig)
endif()

set(pkgconfig_output "${CMAKE_BINARY_DIR}/cmake/pkgconfig/${target_name}.pc")
set(pkgconfig_install_dir "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
set(pkgconfig_install_dir "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
set(pkgconfig_abs_install_dir "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
file(RELATIVE_PATH
PC_CONFIG_RELATIVE_PATH_TO_PREFIX
"${pkgconfig_install_dir}"
"${pkgconfig_abs_install_dir}"
"${CMAKE_INSTALL_PREFIX}"
)

Expand Down

0 comments on commit ec85d5f

Please sign in to comment.