summaryrefslogtreecommitdiff
path: root/debian/patches/use_local_gtest2.diff
diff options
context:
space:
mode:
authorGravatar Benjamin Barenblat <bbaren@google.com>2020-05-12 18:20:27 -0400
committerGravatar Benjamin Barenblat <bbaren@google.com>2020-05-18 15:05:59 -0400
commite05aa44e16cc9c47c8285b920415ac0f4763657a (patch)
tree56af9c85a801d93d1beb720bfee1928db672490f /debian/patches/use_local_gtest2.diff
parentc51510d1d87ebce8615ae1752fd5aca912f6cf4c (diff)
Start packaging Abseil
Create basic packaging for Abseil. There’s still work to be done – there are no autopkgtests, and this package doesn’t install Abseil’s CMake integration. However, you can install the binary packages and build programs that link the libraries.
Diffstat (limited to 'debian/patches/use_local_gtest2.diff')
-rw-r--r--debian/patches/use_local_gtest2.diff21
1 files changed, 21 insertions, 0 deletions
diff --git a/debian/patches/use_local_gtest2.diff b/debian/patches/use_local_gtest2.diff
new file mode 100644
index 00000000..37f3e7d0
--- /dev/null
+++ b/debian/patches/use_local_gtest2.diff
@@ -0,0 +1,21 @@
+From: Benjamin Barenblat <bbaren@google.com>
+Subject: Support testing with a local googletest checkout, part 2
+Forwarded: yes
+Applied-Upstream: https://github.com/abseil/abseil-cpp/commit/79e0dc11514df035a8d07a356f9ee1800fb2160c
+
+use_local_gtest.diff missed a necessary line; add it.
+
+The author works at Google. Upstream applied this patch as Piper revision
+302947488 and exported it to GitHub; the Applied-Upstream URL above points to
+the exported commit.
+
+--- a/CMake/Googletest/DownloadGTest.cmake
++++ b/CMake/Googletest/DownloadGTest.cmake
+@@ -38,6 +38,4 @@
+
+ # Add googletest directly to our build. This defines the gtest and gtest_main
+ # targets.
+-add_subdirectory(${CMAKE_BINARY_DIR}/googletest-src
+- ${CMAKE_BINARY_DIR}/googletest-build
+- EXCLUDE_FROM_ALL)
++add_subdirectory(${absl_gtest_src_dir} ${absl_gtest_build_dir} EXCLUDE_FROM_ALL)