Merge branch 'prefer_flann_config' of https://github.com/StefanBruens…

…/openMVG into develop
openMVG · Feb 2, 2023 · 0e35f8d · 0e35f8d
2 parents 598501e + a462f9f
commit 0e35f8d
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -318,8 +318,15 @@ endif()
 if (NOT DEFINED FLANN_INCLUDE_DIR_HINTS)
   set(FLANN_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/flann/src/cpp)
   set(OpenMVG_USE_INTERNAL_FLANN ON)
+  find_package(Flann QUIET)
+else()
+  find_package(Flann QUIET CONFIG)
+  if (TARGET flann::flann)
+    set(FLANN_LIBRARIES "flann::flann;flann::flann_cpp")
+  else()
+    find_package(Flann QUIET)
+  endif()
 endif()
-find_package(Flann QUIET)
 if (NOT FLANN_FOUND OR OpenMVG_USE_INTERNAL_FLANN)
   set(FLANN_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/flann/src/cpp)
 endif()