diff options
| author | David Seifert <soap@gentoo.org> | 2019-10-05 13:58:45 (GMT) |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2019-10-05 13:58:45 (GMT) |
| commit | 5126ff48d9ac54828d1947d1423a5ef2a8efee3b (patch) | |
| tree | 5f0547db3e7f2d180c33c1bffe5a5d4b09c03d96 /googlemock | |
| parent | 76a560c81cfe75cc6f9ff0c4a37ea3d1ce1229ed (diff) | |
| download | googletest-5126ff48d9ac54828d1947d1423a5ef2a8efee3b.zip googletest-5126ff48d9ac54828d1947d1423a5ef2a8efee3b.tar.gz googletest-5126ff48d9ac54828d1947d1423a5ef2a8efee3b.tar.bz2 | |
Revert "Use pcfiledir for prefix in pkgconfig file"
The change makes implicit assumptions on the layout of the install
tree, which is going to break in many ways.
The correct solution is to use the `PKG_CONFIG_SYSROOT_DIR` variable
to inject the cross-compiled sysroot into `-I` and `-L` paths.
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 08e0454..2ef0fbc 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 b22fe61..04658fe 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) |