From a1acad68bd98a75441a2257f30368c6e21b212dc Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Tue, 21 Jul 2020 06:16:41 -0400 Subject: d/p/use-system-gtest.patch: Update paths to use system gmock and gtest. --- debian/patches/series | 1 + debian/patches/use-system-gtest.patch | 55 +++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 debian/patches/series create mode 100644 debian/patches/use-system-gtest.patch diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..0635bdc --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +use-system-gtest.patch diff --git a/debian/patches/use-system-gtest.patch b/debian/patches/use-system-gtest.patch new file mode 100644 index 0000000..23cae0c --- /dev/null +++ b/debian/patches/use-system-gtest.patch @@ -0,0 +1,55 @@ +Description: Update paths to use system gmock and gtest. +Author: Unit 193 +Forwarded: no + +--- barrier-2.3.3+dfsg.orig/src/test/CMakeLists.txt ++++ barrier-2.3.3+dfsg/src/test/CMakeLists.txt +@@ -15,13 +15,14 @@ + # along with this program. If not, see . + + include_directories( +- ../../ext/gtest +- ../../ext/gtest/include +- ../../ext/gmock +- ../../ext/gmock/include) +- +-add_library(gtest STATIC ../../ext/gtest/src/gtest-all.cc) +-add_library(gmock STATIC ../../ext/gmock/src/gmock-all.cc) ++ /usr/src/googletest/googletest ++ /usr/src/googletest/googletest/include ++ /usr/src/googletest/googlemock ++ /usr/src/googletest/googlemock/include ++) ++ ++add_library(gtest STATIC /usr/src/googletest/googletest/src/gtest-all.cc) ++add_library(gmock STATIC /usr/src/googletest/googlemock/src/gmock-all.cc) + + if (UNIX) + # ignore warnings in gtest and gmock +--- barrier-2.3.3+dfsg.orig/src/test/integtests/CMakeLists.txt ++++ barrier-2.3.3+dfsg/src/test/integtests/CMakeLists.txt +@@ -68,8 +68,8 @@ endif() + + include_directories( + ../../ +- ../../../ext/gtest/include +- ../../../ext/gmock/include ++ /usr/src/googletest/googletest/include ++ /usr/src/googletest/googlemock/include + ) + + if (UNIX) +--- barrier-2.3.3+dfsg.orig/src/test/unittests/CMakeLists.txt ++++ barrier-2.3.3+dfsg/src/test/unittests/CMakeLists.txt +@@ -50,9 +50,8 @@ list(APPEND headers ${platform_sources}) + + include_directories( + ../../ +- ../../../ext/gtest/include +- ../../../ext/gmock/include +- ../../../ext ++ /usr/src/googletest/googletest/include ++ /usr/src/googletest/googlemock/include + ) + + if (UNIX) -- cgit v1.2.3