aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2018-09-04 11:31:18 -0400
committerGitHub <noreply@github.com>2018-09-04 11:31:18 -0400
commita2b149b2398b4954e40df947c54297f266a8a194 (patch)
treeab76a5fa2f7706521104a7fbe3493460e63f0fee
parent3787a483b994784c6710fdf8cc7fb405a4886dd3 (diff)
parent990bf4ffd1edad3c48d40dee78b2fb4e2a1bdd8d (diff)
downloadgoogletest-a2b149b2398b4954e40df947c54297f266a8a194.tar.gz
googletest-a2b149b2398b4954e40df947c54297f266a8a194.tar.bz2
googletest-a2b149b2398b4954e40df947c54297f266a8a194.zip
Merge pull request #1801 from SoapGentoo/fix-gmock-pkgconfig
pkgconfig: Unconditionally depend on GTest when using GMock
-rw-r--r--googlemock/cmake/gmock.pc.in1
-rw-r--r--googlemock/cmake/gmock_main.pc.in1
2 files changed, 2 insertions, 0 deletions
diff --git a/googlemock/cmake/gmock.pc.in b/googlemock/cmake/gmock.pc.in
index c4416426..2ef0fbca 100644
--- a/googlemock/cmake/gmock.pc.in
+++ b/googlemock/cmake/gmock.pc.in
@@ -5,5 +5,6 @@ Name: gmock
Description: GoogleMock (without main() function)
Version: @PROJECT_VERSION@
URL: https://github.com/google/googletest
+Requires: gtest
Libs: -L${libdir} -lgmock @CMAKE_THREAD_LIBS_INIT@
Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ @CMAKE_THREAD_LIBS_INIT@
diff --git a/googlemock/cmake/gmock_main.pc.in b/googlemock/cmake/gmock_main.pc.in
index c377dba1..04658fe2 100644
--- a/googlemock/cmake/gmock_main.pc.in
+++ b/googlemock/cmake/gmock_main.pc.in
@@ -5,5 +5,6 @@ Name: gmock_main
Description: GoogleMock (with main() function)
Version: @PROJECT_VERSION@
URL: https://github.com/google/googletest
+Requires: gmock
Libs: -L${libdir} -lgmock_main @CMAKE_THREAD_LIBS_INIT@
Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ @CMAKE_THREAD_LIBS_INIT@