From 517363f51610ffeeed2df816a6d854ebf56d2dc1 Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Fri, 14 Oct 2022 06:01:16 -0400 Subject: Allow exclusion of gtest if not building tests. Closes: #1020987 --- debian/changelog | 7 +++++++ debian/patches/allow_gtest_exclusion.patch | 22 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 30 insertions(+) create mode 100644 debian/patches/allow_gtest_exclusion.patch diff --git a/debian/changelog b/debian/changelog index ede1254..77fc7ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +barrier (2.4.0+dfsg-3) unstable; urgency=medium + + * d/p/allow_gtest_exclusion.patch: + - Allow exclusion of gtest if not building tests. (Closes: #1020987) + + -- Unit 193 Fri, 14 Oct 2022 06:00:18 -0400 + barrier (2.4.0+dfsg-2) unstable; urgency=medium * d/rules: Restrict tests to amd64 and i386 due to intermittent failures. diff --git a/debian/patches/allow_gtest_exclusion.patch b/debian/patches/allow_gtest_exclusion.patch new file mode 100644 index 0000000..d1263d3 --- /dev/null +++ b/debian/patches/allow_gtest_exclusion.patch @@ -0,0 +1,22 @@ +Description: Allow exclusion of gtest if not building tests. +Author: Unit 193 +Bug-Debian: https://bugs.debian.org/1020987 +Forwarded: no + +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/CMakeLists.txt 2022-09-30 00:56:08.000000000 -0400 ++++ b/src/CMakeLists.txt 2022-09-30 00:56:08.000000000 -0400 +@@ -20,9 +20,9 @@ + add_subdirectory(lib) + add_subdirectory(cmd) + +-include(../cmake/gtest.cmake) + + if (BARRIER_BUILD_TESTS) ++ include(../cmake/gtest.cmake) + add_subdirectory(test/integtests) + add_subdirectory(test/unittests) + endif() diff --git a/debian/patches/series b/debian/patches/series index 9b98a96..e59f2af 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ include-gulrak.patch fix-includes.patch +allow_gtest_exclusion.patch -- cgit v1.2.3