Add patch for new flann

diff --git a/debian/patches/0006-Simplify-and-fix-find-flann.patch b/debian/patches/0006-Simplify-and-fix-find-flann.patch
new file mode 100644 (file)
index 0000000..9c3786d
--- /dev/null
+++ b/debian/patches/0006-Simplify-and-fix-find-flann.patch
@@ -0,0 +1,134 @@
+From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
+Date: Sun, 14 Oct 2018 21:02:49 +0200
+Subject: Simplify and fix find flann
+
+---
+ PCLConfig.cmake.in            | 44 +--------------------------------
+ cmake/Modules/FindFLANN.cmake | 57 ++-----------------------------------------
+ 2 files changed, 3 insertions(+), 98 deletions(-)
+
+diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
+index aa3e000..f192ea5 100644
+--- a/PCLConfig.cmake.in
++++ b/PCLConfig.cmake.in
+@@ -415,51 +415,9 @@ endmacro(find_rssdk)
+ 
+ #remove this as soon as flann is shipped with FindFlann.cmake
+ macro(find_flann)
+-  if(PCL_ALL_IN_ONE_INSTALLER)
+-    set(FLANN_ROOT "${PCL_ROOT}/3rdParty/Flann")
+-  elseif(NOT FLANN_ROOT)
+-    get_filename_component(FLANN_ROOT "@FLANN_INCLUDE_DIRS@" PATH)
+-  endif(PCL_ALL_IN_ONE_INSTALLER)
+   if(PKG_CONFIG_FOUND)
+-    pkg_check_modules(PC_FLANN flann)
++    pkg_check_modules(FLANN flann)
+   endif(PKG_CONFIG_FOUND)
+-
+-  find_path(FLANN_INCLUDE_DIRS flann/flann.hpp
+-    HINTS ${PC_FLANN_INCLUDEDIR} ${PC_FLANN_INCLUDE_DIRS} 
+-          "${FLANN_ROOT}" "$ENV{FLANN_ROOT}"
+-    PATHS "$ENV{PROGRAMFILES}/flann 1.6.9" "$ENV{PROGRAMW6432}/flann 1.6.9"
+-          "$ENV{PROGRAMFILES}/flann" "$ENV{PROGRAMW6432}/flann"
+-    PATH_SUFFIXES include)
+-
+-  find_library(FLANN_LIBRARY
+-    NAMES flann_cpp_s flann_cpp
+-    HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}"
+-    PATHS "$ENV{PROGRAMFILES}/flann 1.6.9" "$ENV{PROGRAMW6432}/flann 1.6.9" 
+-          "$ENV{PROGRAMFILES}/flann" "$ENV{PROGRAMW6432}/flann"
+-    PATH_SUFFIXES lib)
+-
+-  find_library(FLANN_LIBRARY_DEBUG 
+-    NAMES flann_cpp_s-gd flann_cpp-gd flann_cpp_s flann_cpp
+-    HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}"
+-    PATHS "$ENV{PROGRAMFILES}/flann 1.6.9" "$ENV{PROGRAMW6432}/flann 1.6.9" 
+-          "$ENV{PROGRAMFILES}/flann" "$ENV{PROGRAMW6432}/flann"
+-    PATH_SUFFIXES lib)
+-
+-  find_package_handle_standard_args(Flann DEFAULT_MSG FLANN_LIBRARY FLANN_INCLUDE_DIRS)
+-  if(FLANN_FOUND)
+-    get_filename_component(FLANN_LIBRARY_PATH ${FLANN_LIBRARY} PATH)
+-    if(FLANN_LIBRARY_DEBUG)
+-      get_filename_component(FLANN_LIBRARY_DEBUG_PATH ${FLANN_LIBRARY_DEBUG} PATH)
+-      set(FLANN_LIBRARY_DIRS ${FLANN_LIBRARY_PATH} ${FLANN_LIBRARY_DEBUG_PATH}) 
+-      set(FLANN_LIBRARIES optimized ${FLANN_LIBRARY} debug ${FLANN_LIBRARY_DEBUG})
+-    else(FLANN_LIBRARY_DEBUG)
+-      set(FLANN_LIBRARY_DIRS ${FLANN_LIBRARY_PATH}) 
+-      set(FLANN_LIBRARIES ${FLANN_LIBRARY})
+-    endif(FLANN_LIBRARY_DEBUG)
+-    if("${FLANN_LIBRARY}" MATCHES "flann_cpp_s")
+-      set(FLANN_DEFINITIONS ${FLANN_DEFINITIONS} -DFLANN_STATIC)
+-    endif("${FLANN_LIBRARY}" MATCHES "flann_cpp_s")
+-  endif(FLANN_FOUND)
+ endmacro(find_flann)
+ 
+ macro(find_VTK)
+diff --git a/cmake/Modules/FindFLANN.cmake b/cmake/Modules/FindFLANN.cmake
+index b5739dc..2f03ea6 100644
+--- a/cmake/Modules/FindFLANN.cmake
++++ b/cmake/Modules/FindFLANN.cmake
+@@ -1,61 +1,8 @@
+-###############################################################################
+-# Find FLANN
+-#
+-# This sets the following variables:
+-# FLANN_FOUND - True if FLANN was found.
+-# FLANN_INCLUDE_DIRS - Directories containing the FLANN include files.
+-# FLANN_LIBRARIES - Libraries needed to use FLANN.
+-# FLANN_DEFINITIONS - Compiler flags for FLANN.
+-# If FLANN_USE_STATIC is specified and then look for static libraries ONLY else
+-# look for shared ones
+-
+-if(FLANN_USE_STATIC)
+-  set(FLANN_RELEASE_NAME flann_cpp_s)
+-  set(FLANN_DEBUG_NAME flann_cpp_s-gd)
+-else(FLANN_USE_STATIC)
+-  set(FLANN_RELEASE_NAME flann_cpp)
+-  set(FLANN_DEBUG_NAME flann_cpp-gd)
+-endif(FLANN_USE_STATIC)
+-
+ find_package(PkgConfig QUIET)
+-if (FLANN_FIND_VERSION)
+-    pkg_check_modules(PC_FLANN flann>=${FLANN_FIND_VERSION})
+-else(FLANN_FIND_VERSION)
+-    pkg_check_modules(PC_FLANN flann)
+-endif(FLANN_FIND_VERSION)
+-
+-set(FLANN_DEFINITIONS ${PC_FLANN_CFLAGS_OTHER})
+-
+-find_path(FLANN_INCLUDE_DIR flann/flann.hpp
+-          HINTS ${PC_FLANN_INCLUDEDIR} ${PC_FLANN_INCLUDE_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}"
+-          PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann" 
+-          PATH_SUFFIXES include)
+-
+-find_library(FLANN_LIBRARY
+-             NAMES ${FLANN_RELEASE_NAME}
+-             HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}"
+-             PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann" 
+-           PATH_SUFFIXES lib)
+-
+-find_library(FLANN_LIBRARY_DEBUG 
+-             NAMES ${FLANN_DEBUG_NAME} ${FLANN_RELEASE_NAME}
+-           HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}"
+-           PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann" 
+-           PATH_SUFFIXES lib)
+-
+-if(NOT FLANN_LIBRARY_DEBUG)
+-  set(FLANN_LIBRARY_DEBUG ${FLANN_LIBRARY})
+-endif(NOT FLANN_LIBRARY_DEBUG)
+-
+-set(FLANN_INCLUDE_DIRS ${FLANN_INCLUDE_DIR})
+-set(FLANN_LIBRARIES optimized ${FLANN_LIBRARY} debug ${FLANN_LIBRARY_DEBUG})
+-
+-include(FindPackageHandleStandardArgs)
+-find_package_handle_standard_args(FLANN DEFAULT_MSG FLANN_LIBRARY FLANN_INCLUDE_DIR)
+-
+-mark_as_advanced(FLANN_LIBRARY FLANN_LIBRARY_DEBUG FLANN_INCLUDE_DIR)
++pkg_check_modules(FLANN flann)
+ 
+ if(FLANN_FOUND)
++  set(FLANN_FOUND TRUE)
+   message(STATUS "FLANN found (include: ${FLANN_INCLUDE_DIRS}, lib: ${FLANN_LIBRARIES})")
+   if(FLANN_USE_STATIC)
+     add_definitions(-DFLANN_STATIC)

diff --git a/debian/patches/series b/debian/patches/series
index 8b92a36489053061dd0adbce1891b78973fcfd32..59100491c58583716c06490261a675db690c0918 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 2422.patch
 2338.patch
 0001-Generate-pkgconfig-for-2d-module.patch
+0006-Simplify-and-fix-find-flann.patch