[flann] 12/21: Updated patches

[Leopold Palomo-Avellaneda]

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

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

commit 2c14afbc3f63850f7618258096fa2add5f7faa9f
Author: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
Date:   Fri Jul 15 13:40:50 2016 +0200

    Updated patches
---
 debian/patches/0001-Updated-fix-cmake-hdf5.patch | 49 ++++++++++++++++++++++++
 debian/patches/fix-cmake-hdf5.patch              | 44 ---------------------
 debian/patches/series                            |  2 +-
 3 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/debian/patches/0001-Updated-fix-cmake-hdf5.patch b/debian/patches/0001-Updated-fix-cmake-hdf5.patch
new file mode 100644
index 0000000..26e612c
--- /dev/null
+++ b/debian/patches/0001-Updated-fix-cmake-hdf5.patch
@@ -0,0 +1,49 @@
+From: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
+Date: Fri, 15 Jul 2016 13:39:03 +0200
+Subject: Updated fix cmake hdf5
+
+---
+ CMakeLists.txt          | 2 +-
+ examples/CMakeLists.txt | 2 +-
+ test/CMakeLists.txt     | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c021be0..cd56ab9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -77,7 +77,7 @@ find_hdf5()
+ if (NOT HDF5_FOUND)
+ 	message(WARNING "hdf5 library not found, some tests will not be run")
+ else()
+-    include_directories(${HDF5_INCLUDE_DIR})
++    include_directories(${HDF5_INCLUDE_DIRS})
+ endif()
+ 
+ if (USE_MPI OR HDF5_IS_PARALLEL)
+diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
+index ae424e2..e9fef04 100644
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -11,7 +11,7 @@ if (BUILD_C_BINDINGS)
+ endif()
+ 
+ if (HDF5_FOUND)
+-    include_directories(${HDF5_INCLUDE_DIR})
++    include_directories(${HDF5_INCLUDE_DIRS})
+ 
+     add_executable(flann_example_cpp flann_example.cpp)
+     target_link_libraries(flann_example_cpp ${HDF5_LIBRARIES} flann_cpp)
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index f21b58f..ae3f390 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -20,7 +20,7 @@ if (PYTHON_EXECUTABLE)
+ endif()
+ 
+ if (GTEST_FOUND AND HDF5_FOUND)
+-    include_directories(${HDF5_INCLUDE_DIR})
++    include_directories(${HDF5_INCLUDE_DIRS})
+ 
+     set(TEST_LIBRARIES "${HDF5_LIBRARIES}")
+     if (HDF5_IS_PARALLEL)
diff --git a/debian/patches/fix-cmake-hdf5.patch b/debian/patches/fix-cmake-hdf5.patch
deleted file mode 100644
index 688c48f..0000000
--- a/debian/patches/fix-cmake-hdf5.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: flann-1.8.4/CMakeLists.txt
-===================================================================
---- flann-1.8.4.orig/CMakeLists.txt	2014-07-24 16:52:23.000000000 +0200
-+++ flann-1.8.4/CMakeLists.txt	2014-07-24 19:52:39.193104490 +0200
-@@ -71,11 +71,11 @@
-     set(BUILD_PYTHON_BINDINGS OFF)
- endif()
- 
--find_hdf5()
-+find_package(HDF5)
- if (NOT HDF5_FOUND)
- 	message(WARNING "hdf5 library not found, some tests will not be run")
- else()
--    include_directories(${HDF5_INCLUDE_DIR})
-+    include_directories(${HDF5_INCLUDE_DIRS})
- endif()
- 
- if (USE_MPI OR HDF5_IS_PARALLEL)
-Index: flann-1.8.4/examples/CMakeLists.txt
-===================================================================
---- flann-1.8.4.orig/examples/CMakeLists.txt	2013-01-15 22:38:32.000000000 +0100
-+++ flann-1.8.4/examples/CMakeLists.txt	2014-07-24 19:52:04.463947527 +0200
-@@ -11,7 +11,7 @@
- endif()
- 
- if (HDF5_FOUND)
--    include_directories(${HDF5_INCLUDE_DIR})
-+    include_directories(${HDF5_INCLUDE_DIRS})
- 
-     add_executable(flann_example_cpp flann_example.cpp)
-     target_link_libraries(flann_example_cpp ${HDF5_LIBRARIES})
-Index: flann-1.8.4/test/CMakeLists.txt
-===================================================================
---- flann-1.8.4.orig/test/CMakeLists.txt	2013-01-15 22:38:32.000000000 +0100
-+++ flann-1.8.4/test/CMakeLists.txt	2014-07-24 19:52:12.668222600 +0200
-@@ -20,7 +20,7 @@
- endif()
- 
- if (GTEST_FOUND AND HDF5_FOUND)
--	include_directories(${HDF5_INCLUDE_DIR})
-+	include_directories(${HDF5_INCLUDE_DIRS})
- 
-     set(TEST_LIBRARIES "${HDF5_LIBRARIES}")
-     if (HDF5_IS_PARALLEL)
diff --git a/debian/patches/series b/debian/patches/series
index 4ffe824..9612cdd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-fix-cmake-hdf5.patch
+0001-Updated-fix-cmake-hdf5.patch

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