diff options
| author | Jerry Turcios <jerryturcios08@gmail.com> | 2018-10-22 21:16:20 -0400 |
|---|---|---|
| committer | Jerry Turcios <jerryturcios08@gmail.com> | 2018-10-22 21:16:20 -0400 |
| commit | 3468af9b36e7160aafc8b3952b2721dc9d1abd95 (patch) | |
| tree | abece5b448269503a91a98eba0446412d39d0562 /googlemock | |
| parent | 648ac832aa92b9e2f314db47131990eb49a54245 (diff) | |
| parent | 82987067d8cc6ee034abd18a78bd444cb41fd2c5 (diff) | |
| download | googletest-3468af9b36e7160aafc8b3952b2721dc9d1abd95.tar.gz googletest-3468af9b36e7160aafc8b3952b2721dc9d1abd95.tar.bz2 googletest-3468af9b36e7160aafc8b3952b2721dc9d1abd95.zip | |
Merge branch 'master' of https://github.com/google/googletest
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, 6 insertions, 4 deletions
diff --git a/googlemock/cmake/gmock.pc.in b/googlemock/cmake/gmock.pc.in index 2ef0fbca..08e04547 100644 --- a/googlemock/cmake/gmock.pc.in +++ b/googlemock/cmake/gmock.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: gmock Description: GoogleMock (without main() function) diff --git a/googlemock/cmake/gmock_main.pc.in b/googlemock/cmake/gmock_main.pc.in index 04658fe2..b22fe614 100644 --- a/googlemock/cmake/gmock_main.pc.in +++ b/googlemock/cmake/gmock_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: gmock_main Description: GoogleMock (with main() function) |