[ompl] 08/18: Rebasing patches. Cleaning

Leopold Palomo-Avellaneda leo at alaxarxa.net
Sat Jan 28 18:26:03 UTC 2017


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

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

commit f83a6265f12ee8b5cc6ae3a07887afd185579c33
Author: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
Date:   Fri Jan 27 12:37:21 2017 +0100

    Rebasing patches. Cleaning
---
 ...d-functionality-to-findflann-search-macro.patch | 21 ---------------------
 .../0004-Added-FLANN_LIBRARIES-dependency.patch    | 22 ----------------------
 2 files changed, 43 deletions(-)

diff --git a/debian/patches/0003-Add-functionality-to-findflann-search-macro.patch b/debian/patches/0003-Add-functionality-to-findflann-search-macro.patch
deleted file mode 100644
index 3c69684..0000000
--- a/debian/patches/0003-Add-functionality-to-findflann-search-macro.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
-Date: Tue, 30 Aug 2016 12:17:15 +0200
-Subject: Add functionality to findflann search macro
-
----
- CMakeModules/Findflann.cmake | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/CMakeModules/Findflann.cmake b/CMakeModules/Findflann.cmake
-index 3b3f6dc..033e28c 100644
---- a/CMakeModules/Findflann.cmake
-+++ b/CMakeModules/Findflann.cmake
-@@ -1,5 +1,8 @@
- # Find FLANN, a Fast Library for Approximate Nearest Neighbors
- 
-+find_package(PkgConfig)
-+pkg_check_modules(FLANN REQUIRED flann)
-+
- include(FindPackageHandleStandardArgs)
- 
- find_path(FLANN_INCLUDE_DIR flann.hpp PATH_SUFFIXES flann)
diff --git a/debian/patches/0004-Added-FLANN_LIBRARIES-dependency.patch b/debian/patches/0004-Added-FLANN_LIBRARIES-dependency.patch
deleted file mode 100644
index fabe180..0000000
--- a/debian/patches/0004-Added-FLANN_LIBRARIES-dependency.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
-Date: Tue, 30 Aug 2016 12:18:55 +0200
-Subject: Added FLANN_LIBRARIES dependency
-
----
- CMakeModules/OMPLUtils.cmake | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeModules/OMPLUtils.cmake b/CMakeModules/OMPLUtils.cmake
-index 35bc2c7..6f0fbc5 100644
---- a/CMakeModules/OMPLUtils.cmake
-+++ b/CMakeModules/OMPLUtils.cmake
-@@ -7,7 +7,8 @@ macro(add_ompl_test test_name)
-     ${Boost_SERIALIZATION_LIBRARY}
-     ${Boost_FILESYSTEM_LIBRARY}
-     ${Boost_SYSTEM_LIBRARY}
--    ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
-+    ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
-+    ${FLANN_LIBRARIES})
-   add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>)
- endmacro(add_ompl_test)
- 

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



More information about the debian-science-commits mailing list