You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
62 lines
2.7 KiB
62 lines
2.7 KiB
5 years ago
|
From 6caa879a42d97f1b02ecc90c77fc486220251fa1 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Martin Erik Werner <martinerikwerner@gmail.com>
|
||
|
|
Date: Sat, 19 Oct 2019 19:37:16 +0200
|
||
|
|
Subject: [PATCH] pkg-config: Remove pthread link flag from Cflags
|
||
|
|
|
||
|
|
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 .
|
||
|
|
---
|
||
|
|
googlemock/cmake/gmock.pc.in | 2 +-
|
||
|
|
googlemock/cmake/gmock_main.pc.in | 2 +-
|
||
|
|
googletest/cmake/gtest.pc.in | 2 +-
|
||
|
|
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 08e045474..99eb3e178 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 b22fe6148..3186f8edc 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 9aae29e26..49d70c9bb 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 915f2973a..e0d81a8d6 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@
|