| 1 |
commit: 02de457cdcebe9c5675ec2a380abd15b1a094703 |
| 2 |
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com> |
| 3 |
AuthorDate: Thu Jun 23 11:45:38 2022 +0000 |
| 4 |
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me> |
| 5 |
CommitDate: Thu Jun 23 11:45:38 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=02de457c |
| 7 |
|
| 8 |
dev-cpp/scitokens-cpp: More complete patch for unbundling gtest. |
| 9 |
|
| 10 |
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com> |
| 11 |
|
| 12 |
.../files/scitokens-cpp-0.7.1-fix-external-gtest.patch | 8 +++----- |
| 13 |
1 file changed, 3 insertions(+), 5 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-cpp/scitokens-cpp/files/scitokens-cpp-0.7.1-fix-external-gtest.patch b/dev-cpp/scitokens-cpp/files/scitokens-cpp-0.7.1-fix-external-gtest.patch |
| 16 |
index baa4a08f5..91a508c0d 100644 |
| 17 |
--- a/dev-cpp/scitokens-cpp/files/scitokens-cpp-0.7.1-fix-external-gtest.patch |
| 18 |
+++ b/dev-cpp/scitokens-cpp/files/scitokens-cpp-0.7.1-fix-external-gtest.patch |
| 19 |
@@ -1,8 +1,5 @@ |
| 20 |
Bug: https://github.com/scitokens/scitokens-cpp/pull/89 |
| 21 |
- |
| 22 |
---- |
| 23 |
- test/CMakeLists.txt | 4 +++- |
| 24 |
- 1 file changed, 3 insertions(+), 1 deletion(-) |
| 25 |
+Bug: https://github.com/scitokens/scitokens-cpp/pull/90 |
| 26 |
|
| 27 |
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt |
| 28 |
index 22f86a6..2083bff 100644 |
| 29 |
@@ -14,7 +11,8 @@ index 22f86a6..2083bff 100644 |
| 30 |
-add_dependencies(scitokens-gtest gtest) |
| 31 |
+if( NOT SCITOKENS_EXTERNAL_GTEST ) |
| 32 |
+ add_dependencies(scitokens-gtest gtest) |
| 33 |
++ include_directories("${PROJECT_SOURCE_DIR}/vendor/gtest/googletest/include") |
| 34 |
+endif() |
| 35 |
- include_directories("${PROJECT_SOURCE_DIR}/vendor/gtest/googletest/include") |
| 36 |
+-include_directories("${PROJECT_SOURCE_DIR}/vendor/gtest/googletest/include") |
| 37 |
|
| 38 |
if(SCITOKENS_EXTERNAL_GTEST) |
Archives