[flann] 10/21: Removed unneeded patch. Move to CMake option

Leopold Palomo-Avellaneda leo at alaxarxa.net
Fri Jul 15 13:51:26 UTC 2016


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

lepalom-guest pushed a commit to branch master
in repository flann.

commit 33a02eeefb1f784acd0f4f126ac251055289fa48
Author: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
Date:   Fri Jul 15 13:25:14 2016 +0200

    Removed unneeded patch. Move to CMake option
---
 debian/patches/remove_tests.patch | 13 -------------
 debian/patches/series             |  1 -
 debian/rules                      |  1 +
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/debian/patches/remove_tests.patch b/debian/patches/remove_tests.patch
deleted file mode 100644
index dd197e3..0000000
--- a/debian/patches/remove_tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: flann-1.8.3-src/CMakeLists.txt
-===================================================================
---- flann-1.8.3-src.orig/CMakeLists.txt	2013-01-03 13:01:02.619952920 +0100
-+++ flann-1.8.3-src/CMakeLists.txt	2013-01-03 13:01:05.755952938 +0100
-@@ -156,7 +156,7 @@
- add_subdirectory( cmake )
- add_subdirectory( src )
- add_subdirectory( examples )
--add_subdirectory( test )
-+#add_subdirectory( test )
- add_subdirectory( doc )
- 
- 
diff --git a/debian/patches/series b/debian/patches/series
index 57908a3..d5de6ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-remove_tests.patch
 fixmultiarchlibinstall.patch
 fix-cmake-hdf5.patch
diff --git a/debian/rules b/debian/rules
index 96ee78b..ab36cc5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@ CMAKE_FLAGS = \
 	-DUSE_MPI:BOOL=ON \
 	-DUSE_OPENMP:BOOL=ON \
 	-DFLANN_LIB_INSTALL_DIR:STRING="lib/$(DEB_HOST_MULTIARCH)" \
+	-DBUILD_TESTS:BOOL=OFF \
 	-DBUILD_CUDA_LIB:BOOL=OFF
 
 %:

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



More information about the debian-science-commits mailing list