commit: 02de457cdcebe9c5675ec2a380abd15b1a094703 Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com> AuthorDate: Thu Jun 23 11:45:38 2022 +0000 Commit: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com> CommitDate: Thu Jun 23 11:45:38 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=02de457c
dev-cpp/scitokens-cpp: More complete patch for unbundling gtest. Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com> .../files/scitokens-cpp-0.7.1-fix-external-gtest.patch | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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 index baa4a08f5..91a508c0d 100644 --- 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 @@ -1,8 +1,5 @@ Bug: https://github.com/scitokens/scitokens-cpp/pull/89 - ---- - test/CMakeLists.txt | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) +Bug: https://github.com/scitokens/scitokens-cpp/pull/90 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 22f86a6..2083bff 100644 @@ -14,7 +11,8 @@ index 22f86a6..2083bff 100644 -add_dependencies(scitokens-gtest gtest) +if( NOT SCITOKENS_EXTERNAL_GTEST ) + add_dependencies(scitokens-gtest gtest) ++ include_directories("${PROJECT_SOURCE_DIR}/vendor/gtest/googletest/include") +endif() - include_directories("${PROJECT_SOURCE_DIR}/vendor/gtest/googletest/include") +-include_directories("${PROJECT_SOURCE_DIR}/vendor/gtest/googletest/include") if(SCITOKENS_EXTERNAL_GTEST)
