hugin-devs team mailing list archive

[tmodes <938293@xxxxxxxxxxxxxxxxxx>]

Hi Bruno,

try the following:
in CMakeLists.txt:
remove line 110: include_directories( ${CMAKE_SOURCE_DIR}/src/foreign )
and add instead after line 288: FIND_PACKAGE(flann)

IF(NOT FLANN_FOUND)
  include_directories( ${CMAKE_SOURCE_DIR}/src/foreign )
ENDIF()

Maybe a further change to src/hugin_base/algorithms/optimizer/PhotometricOptimizer.cpp is necessary
Replace
#include <levmar/lm.h>
with
#include <foreign/levmar/lm.h>

-- 
You received this bug notification because you are a member of Hugin
Developers, which is subscribed to Hugin.
https://bugs.launchpad.net/bugs/938293

Title:
  cpfind links against system flann, but includes the bundled flann

Status in Hugin - Panorama Tools GUI:
  New

Bug description:
  During the build process, a system installed flann is detected fine,
  but the include lines for cpfind have these entries in this order:

   -I/path/to/builddir/src/foreign ... -I/usr/include

  The result is that although cpfind dynamically links to the system
  flann library, cpfind is actually compiled using the bundled flann
  headers. This fails on fedora f17, because it has flann-1.7.1, whereas
  Hugin HG tip bundles flann-1.6.1 headers.

  I tried fixing this by rearranging lines in CMakeLists.txt, but it
  doesn't seem to control the order of -I entries, so I don't know
  enough cmake magic.

  For the fedora package simply removing the src/foreign/flann folder
  lets me build ok, but this isn't a solution for most users.

To manage notifications about this bug go to:
https://bugs.launchpad.net/hugin/+bug/938293/+subscriptions