Compute ignition .pc file relative path to prefix

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
gazebosim · Jan 8, 2021 · 1e39fa0 · 1e39fa0
1 parent e3c39ee
commit 1e39fa0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/cmake/IgnPackaging.cmake b/cmake/IgnPackaging.cmake
@@ -198,12 +198,18 @@ function(_ign_create_pkgconfig)
   endif()
 
   set(pkgconfig_output "${CMAKE_BINARY_DIR}/cmake/pkgconfig/${target_name}.pc")
+  set(pkgconfig_install_dir "${IGN_LIB_INSTALL_DIR}/pkgconfig")
+  file(RELATIVE_PATH
+    PC_CONFIG_RELATIVE_PATH_TO_PREFIX
+    "${CMAKE_INSTALL_PREFIX}/${pkgconfig_install_dir}"
+    "${CMAKE_INSTALL_PREFIX}"
+  )
 
   configure_file(${pkgconfig_input} ${pkgconfig_output} @ONLY)
 
   install(
     FILES ${pkgconfig_output}
-    DESTINATION ${IGN_LIB_INSTALL_DIR}/pkgconfig
+    DESTINATION ${pkgconfig_install_dir}
     COMPONENT pkgconfig)
 
 endfunction()

diff --git a/cmake/pkgconfig/ignition-component.pc.in b/cmake/pkgconfig/ignition-component.pc.in
@@ -1,4 +1,4 @@
-prefix=@CMAKE_INSTALL_PREFIX@
+prefix=${pcfiledir}/@PC_CONFIG_RELATIVE_PATH_TO_PREFIX@
 libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
 includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/ignition/@IGN_DESIGNATION@@PROJECT_VERSION_MAJOR@
 

diff --git a/cmake/pkgconfig/ignition.pc.in b/cmake/pkgconfig/ignition.pc.in
@@ -1,4 +1,4 @@
-prefix=${pcfiledir}/../..
+prefix=${pcfiledir}/@PC_CONFIG_RELATIVE_PATH_TO_PREFIX@
 libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
 includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/ignition/@IGN_DESIGNATION@@PROJECT_VERSION_MAJOR@