diff options
| author | Martin Erik Werner <martinerikwerner@gmail.com> | 2019-10-19 17:37:16 (GMT) |
|---|---|---|
| committer | Martin Erik Werner <martinerikwerner@gmail.com> | 2019-11-05 21:40:49 (GMT) |
| commit | 6caa879a42d97f1b02ecc90c77fc486220251fa1 (patch) | |
| tree | 5857f78c1c6d26e46d986dfb99a34cd1c4b491e3 | |
| parent | 72adf7a4155b6642da1e6761678fe546590c0269 (diff) | |
| download | googletest-6caa879a42d97f1b02ecc90c77fc486220251fa1.zip googletest-6caa879a42d97f1b02ecc90c77fc486220251fa1.tar.gz googletest-6caa879a42d97f1b02ecc90c77fc486220251fa1.tar.bz2 | |
pkg-config: Remove pthread link flag from Cflagsrefs/pull/2556/head
Remove the threads link library variable references from the pkg-config
Cflags: field, removing -lpthread(s) from the compile flags.
"-l*" linker flags should only be part of the Libs: section and should
not be part of the Cflags: section in pkg-config files.
This was first suggested in
https://github.com/google/googletest/pull/2006 and further discussed in
https://github.com/google/googletest/pull/2483 .
| -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 08e0454..99eb3e1 100644 --- a/googlemock/cmake/gmock.pc.in +++ b/googlemock/cmake/gmock.pc.in @@ -8,4 +8,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 b22fe61..3186f8e 100644 --- a/googlemock/cmake/gmock_main.pc.in +++ b/googlemock/cmake/gmock_main.pc.in @@ -8,4 +8,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 9aae29e..49d70c9 100644 --- a/googletest/cmake/gtest.pc.in +++ b/googletest/cmake/gtest.pc.in @@ -7,4 +7,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 915f297..e0d81a8 100644 --- a/googletest/cmake/gtest_main.pc.in +++ b/googletest/cmake/gtest_main.pc.in @@ -8,4 +8,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@ |