diff options
| author | Azamat H. Hackimov <azamat.hackimov@gmail.com> | 2022-09-17 12:31:33 +0300 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-09-25 02:18:24 +0100 |
| commit | 9614b28e55585a296741eeffd46952ec79223f13 (patch) | |
| tree | 6c9fcbedf9afad0a08ffc81206ae8d96b659b368 /dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-gtest.patch | |
| parent | 4df3594af63a48402e249ae86c7288ec33ad0adc (diff) | |
| download | gentoo-9614b28e55585a296741eeffd46952ec79223f13.tar.gz gentoo-9614b28e55585a296741eeffd46952ec79223f13.tar.bz2 gentoo-9614b28e55585a296741eeffd46952ec79223f13.zip | |
dev-cpp/yaml-cpp: update EAPI 7 -> 8, fix installed .pc & CMake files
Closes: https://bugs.gentoo.org/867955
Signed-off-by: Azamat H. Hackimov <azamat.hackimov@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/27302
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-gtest.patch')
| -rw-r--r-- | dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-gtest.patch | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-gtest.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-gtest.patch index 45eebb43ffe2..bd05fccca373 100644 --- a/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-gtest.patch +++ b/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-gtest.patch @@ -1,8 +1,11 @@ -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 5ebc1a6..f02c2bb 100644 +From 30fbefe6102da12e8d4d132aa4af2e24bfda9bfb Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com> +Date: Sat, 17 Sep 2022 12:25:24 +0300 +Subject: [PATCH] Use external gtest dependency + --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt -@@ -1,13 +1,10 @@ +@@ -1,15 +1,10 @@ find_package(Threads REQUIRED) +find_package(GTest REQUIRED CONFIG) @@ -14,10 +17,12 @@ index 5ebc1a6..f02c2bb 100644 - "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.10.0" - "${CMAKE_CURRENT_BINARY_DIR}/prefix") - - include_directories(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.10.0/googletest/include") - +-include_directories(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.10.0/googletest/include") +- set(test-new-api-pattern "new-api/*.cpp") -@@ -38,7 +35,7 @@ target_link_libraries(yaml-cpp-tests + set(test-source-pattern "*.cpp" "integration/*.cpp" "node/*.cpp") + if (CMAKE_VERSION VERSION_GREATER 3.11) +@@ -38,7 +33,7 @@ target_link_libraries(yaml-cpp-tests PRIVATE Threads::Threads yaml-cpp |