[arrayfire] 07/13: Add patch allowing build of testsuite with Debian gtest.

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Tue Nov 17 15:57:05 UTC 2015


This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/sid
in repository arrayfire.

commit f3f7b600de2ee663d289866ff426a435b5fca140
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Nov 17 12:05:17 2015 +0000

    Add patch allowing build of testsuite with Debian gtest.
---
 debian/patches/Use-system-gtest.patch | 22 ++++++++++++++++++++++
 debian/patches/series                 |  1 +
 2 files changed, 23 insertions(+)

diff --git a/debian/patches/Use-system-gtest.patch b/debian/patches/Use-system-gtest.patch
new file mode 100644
index 0000000..e10404c
--- /dev/null
+++ b/debian/patches/Use-system-gtest.patch
@@ -0,0 +1,22 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Tue, 17 Nov 2015 12:04:49 +0000
+Subject: Use system gtest.
+
+---
+ CMakeModules/build_gtest.cmake | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeModules/build_gtest.cmake b/CMakeModules/build_gtest.cmake
+index 4d7fbbe..f9dec19 100644
+--- a/CMakeModules/build_gtest.cmake
++++ b/CMakeModules/build_gtest.cmake
+@@ -50,7 +50,8 @@ ExternalProject_Add(
+     ${BUILD_NAME}
+     # URL http://googletest.googlecode.com/files/gtest-1.7.0.zip
+     # URL_MD5 2d6ec8ccdf5c46b05ba54a9fd1d130d7
+-    SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../test/gtest"
++    DOWNLOAD_COMMAND ""
++    SOURCE_DIR "/usr/src/gtest"
+     PREFIX ${prefix}
+     BINARY_DIR ${BUILD_BINARY_DIR}
+     TIMEOUT 10
diff --git a/debian/patches/series b/debian/patches/series
index bc6903c..06570a0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 Use-system-mathjax.patch
 Disable-privacy-breaching-settings.patch
 Fix-CBLAS-detection.patch
+Use-system-gtest.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git



More information about the debian-science-commits mailing list