diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-10-22 15:28:57 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-10-22 15:28:57 (GMT) |
| commit | 572050dd283577ac51c21e7aaf750a67f98f4dc0 (patch) | |
| tree | 3c00e42f49f6cb5a8d1659b68595eff3d45c74a1 /googletest | |
| parent | f410177a8b54705bb5efaa7be4ef322153349187 (diff) | |
| parent | 2c19680bf99dbab41f08b4d39f401486d3a74d06 (diff) | |
| download | googletest-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 'googletest')
| -rw-r--r-- | googletest/cmake/gtest.pc.in | 5 | ||||
| -rw-r--r-- | googletest/cmake/gtest_main.pc.in | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/googletest/cmake/gtest.pc.in b/googletest/cmake/gtest.pc.in index e7967ad..9aae29e 100644 --- a/googletest/cmake/gtest.pc.in +++ b/googletest/cmake/gtest.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: gtest Description: GoogleTest (without main() function) diff --git a/googletest/cmake/gtest_main.pc.in b/googletest/cmake/gtest_main.pc.in index fe25d9c..915f297 100644 --- a/googletest/cmake/gtest_main.pc.in +++ b/googletest/cmake/gtest_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: gtest_main Description: GoogleTest (with main() function) |