Use pcfiledir for prefix in pkgconfig file

Using absolute paths in the pkg-config file makes it not relocatable and leads to problems, when trying to use it with precompiled cross toolchains. Setting prefix to relative path based on pcfiledir makes it more reliable for such cases.

Use pcfiledir for prefix in pkgconfig file
095b3113 · Filipp Andjelo · Filipp Andjelo · 658c6390 · 095b3113 · 095b3113
Commit 095b3113 authored Oct 11, 2018 by Filipp Andjelo Committed by Filipp Andjelo Oct 11, 2018
Showing with 12 additions and 8 deletions

gmock.pc.in googlemock/cmake/gmock.pc.in +3 -2

gmock_main.pc.in googlemock/cmake/gmock_main.pc.in +3 -2

gtest.pc.in googletest/cmake/gtest.pc.in +3 -2

gtest_main.pc.in googletest/cmake/gtest_main.pc.in +3 -2

No files found.
--- a/googlemock/cmake/gmock.pc.in
+++ b/googlemock/cmake/gmock.pc.in
-libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+prefix=${pcfiledir}/../..
+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@

 Name: gmock
 Description: GoogleMock (without main() function)

--- a/googlemock/cmake/gmock_main.pc.in
+++ b/googlemock/cmake/gmock_main.pc.in
-libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+prefix=${pcfiledir}/../..
+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@

 Name: gmock_main
 Description: GoogleMock (with main() function)

--- a/googletest/cmake/gtest.pc.in
+++ b/googletest/cmake/gtest.pc.in
-libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+prefix=${pcfiledir}/../..
+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@

 Name: gtest
 Description: GoogleTest (without main() function)

--- a/googletest/cmake/gtest_main.pc.in
+++ b/googletest/cmake/gtest_main.pc.in
-libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+prefix=${pcfiledir}/../..
+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@

 Name: gtest_main
 Description: GoogleTest (with main() function)