diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-10-07 14:52:49 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-10-07 14:52:49 -0400 |
| commit | 4360e4267c1e873946428019675bea9cc10c0bf1 (patch) | |
| tree | cce8a9ecea7d3979f426c72903c2d2dfefae3ecb /googlemock | |
| parent | 76a560c81cfe75cc6f9ff0c4a37ea3d1ce1229ed (diff) | |
| parent | b96832a44b4994cafc824f200d69232d79f30d81 (diff) | |
| download | googletest-4360e4267c1e873946428019675bea9cc10c0bf1.tar.gz googletest-4360e4267c1e873946428019675bea9cc10c0bf1.tar.bz2 googletest-4360e4267c1e873946428019675bea9cc10c0bf1.zip | |
Merge pull request #2491 from SoapGentoo:fix-GNUInstallDirs-pkg-config
PiperOrigin-RevId: 273342665
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/cmake/gmock.pc.in | 5 | ||||
| -rw-r--r-- | googlemock/cmake/gmock_main.pc.in | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/googlemock/cmake/gmock.pc.in b/googlemock/cmake/gmock.pc.in index 08e04547..2ef0fbca 100644 --- a/googlemock/cmake/gmock.pc.in +++ b/googlemock/cmake/gmock.pc.in @@ -1,6 +1,5 @@ -prefix=${pcfiledir}/../.. -libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +includedir=@CMAKE_INSTALL_FULL_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 b22fe614..04658fe2 100644 --- a/googlemock/cmake/gmock_main.pc.in +++ b/googlemock/cmake/gmock_main.pc.in @@ -1,6 +1,5 @@ -prefix=${pcfiledir}/../.. -libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ Name: gmock_main Description: GoogleMock (with main() function) |