Merge pull request #1905 from fandjelo:relocatable-pkgconfig-fix

PiperOrigin-RevId: 217923705

Merge pull request #1905 from fandjelo:relocatable-pkgconfig-fix
PiperOrigin-RevId: 217923705
572050dd · Gennadiy Civil · f410177a · 2c19680b · 572050dd · 572050dd
Commit 572050dd authored Oct 22, 2018 by Gennadiy Civil
4 changed files
--- 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)