summaryrefslogtreecommitdiffstats
path: root/googlemock
diff options
context:
space:
mode:
authorFilipp Andjelo <filipp.andjelo@gmail.com>2018-10-11 12:09:57 (GMT)
committerFilipp Andjelo <filipp.andjelo@hacon.de>2018-10-11 12:09:57 (GMT)
commit095b3113e7438fd0be901e20b40d376bcd8ef860 (patch)
treeb1c652716083c4ec945ac0a42061c3da1411ae2d /googlemock
parent658c6390a5b363f46c6ad448ad1bce9d6e97e53a (diff)
downloadgoogletest-095b3113e7438fd0be901e20b40d376bcd8ef860.zip
googletest-095b3113e7438fd0be901e20b40d376bcd8ef860.tar.gz
googletest-095b3113e7438fd0be901e20b40d376bcd8ef860.tar.bz2
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.
Diffstat (limited to 'googlemock')
-rw-r--r--googlemock/cmake/gmock.pc.in5
-rw-r--r--googlemock/cmake/gmock_main.pc.in5
2 files changed, 6 insertions, 4 deletions
diff --git a/googlemock/cmake/gmock.pc.in b/googlemock/cmake/gmock.pc.in
index 2ef0fbc..08e0454 100644
--- a/googlemock/cmake/gmock.pc.in
+++ b/googlemock/cmake/gmock.pc.in
@@ -1,5 +1,6 @@
-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)
diff --git a/googlemock/cmake/gmock_main.pc.in b/googlemock/cmake/gmock_main.pc.in
index 04658fe..b22fe61 100644
--- a/googlemock/cmake/gmock_main.pc.in
+++ b/googlemock/cmake/gmock_main.pc.in
@@ -1,5 +1,6 @@
-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)