diff options
Diffstat (limited to 'debian/patches/use-system-gtest.patch')
| -rw-r--r-- | debian/patches/use-system-gtest.patch | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/debian/patches/use-system-gtest.patch b/debian/patches/use-system-gtest.patch deleted file mode 100644 index 23cae0c..0000000 --- a/debian/patches/use-system-gtest.patch +++ /dev/null @@ -1,55 +0,0 @@ -Description: Update paths to use system gmock and gtest. -Author: Unit 193 <unit193@debian.org> -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 <http://www.gnu.org/licenses/>. - - 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) |