diff options
| author | David Seifert <soap@gentoo.org> | 2019-10-05 15:58:45 +0200 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2019-10-05 15:58:45 +0200 |
| commit | 5126ff48d9ac54828d1947d1423a5ef2a8efee3b (patch) | |
| tree | 5f0547db3e7f2d180c33c1bffe5a5d4b09c03d96 /googletest/cmake | |
| parent | 76a560c81cfe75cc6f9ff0c4a37ea3d1ce1229ed (diff) | |
| download | googletest-5126ff48d9ac54828d1947d1423a5ef2a8efee3b.tar.gz googletest-5126ff48d9ac54828d1947d1423a5ef2a8efee3b.tar.bz2 googletest-5126ff48d9ac54828d1947d1423a5ef2a8efee3b.zip | |
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 'googletest/cmake')
| -rw-r--r-- | googletest/cmake/gtest.pc.in | 5 | ||||
| -rw-r--r-- | googletest/cmake/gtest_main.pc.in | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/googletest/cmake/gtest.pc.in b/googletest/cmake/gtest.pc.in index 9aae29e2..e7967ad5 100644 --- a/googletest/cmake/gtest.pc.in +++ b/googletest/cmake/gtest.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: gtest Description: GoogleTest (without main() function) diff --git a/googletest/cmake/gtest_main.pc.in b/googletest/cmake/gtest_main.pc.in index 915f2973..fe25d9c7 100644 --- a/googletest/cmake/gtest_main.pc.in +++ b/googletest/cmake/gtest_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: gtest_main Description: GoogleTest (with main() function) |