diff options
| author | Andy Getz <durandal@google.com> | 2019-11-13 17:03:46 -0500 |
|---|---|---|
| committer | Andy Getz <durandal@google.com> | 2019-11-13 17:03:46 -0500 |
| commit | 11440f27c66da2ace6ec908a6081b23d230e09b8 (patch) | |
| tree | a4a5efa5ee612bf155beba7a67cc61c6d7973b57 | |
| parent | d5707695cb020ace53dc35f30dd1c3f463daf98e (diff) | |
| parent | 6caa879a42d97f1b02ecc90c77fc486220251fa1 (diff) | |
| download | googletest-11440f27c66da2ace6ec908a6081b23d230e09b8.tar.gz googletest-11440f27c66da2ace6ec908a6081b23d230e09b8.tar.bz2 googletest-11440f27c66da2ace6ec908a6081b23d230e09b8.zip | |
Merge pull request #2556 from ienorand:avoid-pkg-config-lpthread-cflag
PiperOrigin-RevId: 279375858
| -rw-r--r-- | googlemock/cmake/gmock.pc.in | 2 | ||||
| -rw-r--r-- | googlemock/cmake/gmock_main.pc.in | 2 | ||||
| -rw-r--r-- | googletest/cmake/gtest.pc.in | 2 | ||||
| -rw-r--r-- | googletest/cmake/gtest_main.pc.in | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/googlemock/cmake/gmock.pc.in b/googlemock/cmake/gmock.pc.in index 2ef0fbca..5780fcaa 100644 --- a/googlemock/cmake/gmock.pc.in +++ b/googlemock/cmake/gmock.pc.in @@ -7,4 +7,4 @@ 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@ +Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ diff --git a/googlemock/cmake/gmock_main.pc.in b/googlemock/cmake/gmock_main.pc.in index 04658fe2..f2dfe69e 100644 --- a/googlemock/cmake/gmock_main.pc.in +++ b/googlemock/cmake/gmock_main.pc.in @@ -7,4 +7,4 @@ 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@ +Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ diff --git a/googletest/cmake/gtest.pc.in b/googletest/cmake/gtest.pc.in index e7967ad5..b4148fae 100644 --- a/googletest/cmake/gtest.pc.in +++ b/googletest/cmake/gtest.pc.in @@ -6,4 +6,4 @@ Description: GoogleTest (without main() function) Version: @PROJECT_VERSION@ URL: https://github.com/google/googletest Libs: -L${libdir} -lgtest @CMAKE_THREAD_LIBS_INIT@ -Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ @CMAKE_THREAD_LIBS_INIT@ +Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ diff --git a/googletest/cmake/gtest_main.pc.in b/googletest/cmake/gtest_main.pc.in index fe25d9c7..1e01bd19 100644 --- a/googletest/cmake/gtest_main.pc.in +++ b/googletest/cmake/gtest_main.pc.in @@ -7,4 +7,4 @@ Version: @PROJECT_VERSION@ URL: https://github.com/google/googletest Requires: gtest Libs: -L${libdir} -lgtest_main @CMAKE_THREAD_LIBS_INIT@ -Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ @CMAKE_THREAD_LIBS_INIT@ +Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ |