Skip to content

GitLab

Unverified Commit a2b149b2 authored by Gennadiy Civil's avatar Gennadiy Civil Committed by GitHub
Browse files

Merge pull request #1801 from SoapGentoo/fix-gmock-pkgconfig 

pkgconfig: Unconditionally depend on GTest when using GMock
parents 3787a483 990bf4ff
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
googlemock/cmake/gmock.pc.in
View file @ a2b149b2
...@@ -5,5 +5,6 @@ Name: gmock ...@@ -5,5 +5,6 @@ Name: gmock
Description: GoogleMock (without main() function) Description: GoogleMock (without main() function)
Version: @PROJECT_VERSION@ Version: @PROJECT_VERSION@
URL: https://github.com/google/googletest URL: https://github.com/google/googletest
Requires: gtest
Libs: -L${libdir} -lgmock @CMAKE_THREAD_LIBS_INIT@ Libs: -L${libdir} -lgmock @CMAKE_THREAD_LIBS_INIT@
Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ @CMAKE_THREAD_LIBS_INIT@ Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ @CMAKE_THREAD_LIBS_INIT@
googlemock/cmake/gmock_main.pc.in
View file @ a2b149b2
...@@ -5,5 +5,6 @@ Name: gmock_main ...@@ -5,5 +5,6 @@ Name: gmock_main
Description: GoogleMock (with main() function) Description: GoogleMock (with main() function)
Version: @PROJECT_VERSION@ Version: @PROJECT_VERSION@
URL: https://github.com/google/googletest URL: https://github.com/google/googletest
Requires: gmock
Libs: -L${libdir} -lgmock_main @CMAKE_THREAD_LIBS_INIT@ Libs: -L${libdir} -lgmock_main @CMAKE_THREAD_LIBS_INIT@
Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ @CMAKE_THREAD_LIBS_INIT@ Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ @CMAKE_THREAD_LIBS_INIT@
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment