summaryrefslogtreecommitdiffstats
path: root/googlemock
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-10-22 15:28:57 (GMT)
committerGennadiy Civil <misterg@google.com>2018-10-22 15:28:57 (GMT)
commit572050dd283577ac51c21e7aaf750a67f98f4dc0 (patch)
tree3c00e42f49f6cb5a8d1659b68595eff3d45c74a1 /googlemock
parentf410177a8b54705bb5efaa7be4ef322153349187 (diff)
parent2c19680bf99dbab41f08b4d39f401486d3a74d06 (diff)
downloadgoogletest-572050dd283577ac51c21e7aaf750a67f98f4dc0.zip
googletest-572050dd283577ac51c21e7aaf750a67f98f4dc0.tar.gz
googletest-572050dd283577ac51c21e7aaf750a67f98f4dc0.tar.bz2
Merge pull request #1905 from fandjelo:relocatable-pkgconfig-fix
PiperOrigin-RevId: 217923705
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)