Commit bd0ec3b2 authored by Andreas Metzler's avatar Andreas Metzler

Use flann pkg-config change from upstream HG

Replace 20_flann_find_pkg-config.patch with the version commited to
upstream HG (which adds a non-UNIX else).
20_1a94c3ea8898_Update_flann_search_module.diff
parent 229650b7
hugin (2018.0.0+dfsg-4) UNRELEASED; urgency=medium
* Replace 20_flann_find_pkg-config.patch with the version commited to
upstream HG (which adds a non-UNIX else).
20_1a94c3ea8898_Update_flann_search_module.diff
-- Andreas Metzler <ametzler@debian.org> Sat, 03 Nov 2018 16:32:20 +0100
hugin (2018.0.0+dfsg-3) unstable; urgency=medium
* 20_flann_find_pkg-config.patch: Use pkg-config to find flann, linking
......
Description: Use pkg-config to find flann
Author: Jochen Sprickerhof <jspricke@debian.org>
Bug-Debian: https://bugs.debian.org/911022
Origin: vendor
Forwarded: no
Reviewed-By: Andreas Metzler <ametzler@debian.org>
Last-Update: 2018-10-14
# HG changeset patch
# User tmodes
# Date 1541100606 -3600
# Thu Nov 01 20:30:06 2018 +0100
# Node ID 1a94c3ea8898cae9ee89ccb72e4472cef5b4e787
# Parent 5e2f28988093b50a824ece0efd256cbcb4eb7944
Update flann search module (initial patch by Debian photo team)
--- hugin-2018.0.0+dfsg.orig/CMakeModules/FindFLANN.cmake
+++ hugin-2018.0.0+dfsg/CMakeModules/FindFLANN.cmake
@@ -9,17 +9,14 @@
diff -r 5e2f28988093 -r 1a94c3ea8898 CMakeModules/FindFLANN.cmake
--- a/CMakeModules/FindFLANN.cmake Thu Nov 01 18:17:13 2018 +0100
+++ b/CMakeModules/FindFLANN.cmake Thu Nov 01 20:30:06 2018 +0100
@@ -8,18 +8,27 @@
# FLANN_LIBRARIES
# FLANN_FOUND
-
-find_path(FLANN_INCLUDE_DIRS flann/flann.hpp)
+find_package(PkgConfig QUIET)
+pkg_check_modules(FLANN flann)
+if(UNIX)
+ find_package(PkgConfig QUIET)
+ pkg_check_modules(FLANN flann)
+else()
+ find_path(FLANN_INCLUDE_DIRS flann/flann.hpp)
-if(FLANN_INCLUDE_DIRS)
- find_library(FLANN_LIBRARIES flann_cpp)
- if(FLANN_LIBRARIES)
+ if(FLANN_INCLUDE_DIRS)
+ find_library(FLANN_LIBRARIES flann_cpp)
+ if(FLANN_LIBRARIES)
+ set(FLANN_FOUND "YES")
+ endif()
+ else()
+ set(FLANN_FOUND "NO")
+ endif()
+endif()
+
+if(FLANN_FOUND)
MESSAGE(STATUS "flann library found")
- set(FLANN_FOUND "YES")
- endif(FLANN_LIBRARIES)
-else(FLANN_INCLUDE_DIRS)
+else(FLANN_FOUND)
+else()
message(STATUS "flann library not found. falling back to included copy")
set(FLANN_LIBRARIES "flann_cpp")
set(FLANN_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/src/foreign")
-endif(FLANN_INCLUDE_DIRS)
+endif(FLANN_FOUND)
+endif()
20_flann_find_pkg-config.patch
20_1a94c3ea8898_Update_flann_search_module.diff
30_typo_constrast.diff
43_fallbackhelp.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment