Merge pull request #3317 from taketwo/fix-find-flann

Fix FindFLANN.cmake script
PointCloudLibrary · Sep 10, 2019 · 39bc1c2 · 39bc1c2
2 parents 261f07e + 65b9147
commit 39bc1c2
Showing 1 changed file with 28 additions and 17 deletions.
diff --git a/cmake/Modules/FindFLANN.cmake b/cmake/Modules/FindFLANN.cmake
@@ -34,6 +34,12 @@
 #     target_link_libraries(foo FLANN::FLANN)
 #
 
+# Early return if FLANN target is already defined. This makes it safe to run
+# this script multiple times.
+if(TARGET FLANN::FLANN)
+  return()
+endif()
+
 # First try to locate FLANN using modern config
 find_package(flann NO_MODULE ${FLANN_FIND_VERSION} QUIET)
 if(flann_FOUND)
@@ -120,26 +126,31 @@ find_package_handle_standard_args(
 )
 
 if(FLANN_FOUND)
-  if(NOT TARGET FLANN::FLANN)
-    add_library(FLANN::FLANN ${FLANN_LIBRARY_TYPE} IMPORTED)
-    set_target_properties(FLANN::FLANN PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${FLANN_INCLUDE_DIR}")
-    set_target_properties(FLANN::FLANN PROPERTIES INTERFACE_COMPILE_DEFINITIONS "${PC_FLANN_CFLAGS_OTHER}")
-    set_property(TARGET FLANN::FLANN APPEND PROPERTY IMPORTED_CONFIGURATIONS "RELEASE")
-    set_target_properties(FLANN::FLANN PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX")
+  add_library(FLANN::FLANN ${FLANN_LIBRARY_TYPE} IMPORTED)
+  set_target_properties(FLANN::FLANN PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${FLANN_INCLUDE_DIR}")
+  set_target_properties(FLANN::FLANN PROPERTIES INTERFACE_COMPILE_DEFINITIONS "${PC_FLANN_CFLAGS_OTHER}")
+  set_property(TARGET FLANN::FLANN APPEND PROPERTY IMPORTED_CONFIGURATIONS "RELEASE")
+  set_target_properties(FLANN::FLANN PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX")
+  if(WIN32 AND NOT FLANN_USE_STATIC)
+    set_target_properties(FLANN::FLANN PROPERTIES IMPORTED_IMPLIB_RELEASE "${FLANN_LIBRARY}")
+  else()
+    set_target_properties(FLANN::FLANN PROPERTIES IMPORTED_LOCATION_RELEASE "${FLANN_LIBRARY}")
+  endif()
+  if(FLANN_LIBRARY_DEBUG)
+    set_property(TARGET FLANN::FLANN APPEND PROPERTY IMPORTED_CONFIGURATIONS "DEBUG")
+    set_target_properties(FLANN::FLANN PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX")
     if(WIN32 AND NOT FLANN_USE_STATIC)
-      set_target_properties(FLANN::FLANN PROPERTIES IMPORTED_IMPLIB_RELEASE "${FLANN_LIBRARY}")
+      set_target_properties(FLANN::FLANN PROPERTIES IMPORTED_IMPLIB_DEBUG "${FLANN_LIBRARY_DEBUG}")
     else()
-      set_target_properties(FLANN::FLANN PROPERTIES IMPORTED_LOCATION_RELEASE "${FLANN_LIBRARY}")
-    endif()
-    if(FLANN_LIBRARY_DEBUG)
-      set_property(TARGET FLANN::FLANN APPEND PROPERTY IMPORTED_CONFIGURATIONS "DEBUG")
-      set_target_properties(FLANN::FLANN PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX")
-      if(WIN32 AND NOT FLANN_USE_STATIC)
-        set_target_properties(FLANN::FLANN PROPERTIES IMPORTED_IMPLIB_DEBUG "${FLANN_LIBRARY_DEBUG}")
-      else()
-        set_target_properties(FLANN::FLANN PROPERTIES IMPORTED_LOCATION_DEBUG "${FLANN_LIBRARY_DEBUG}")
-      endif()
+      set_target_properties(FLANN::FLANN PROPERTIES IMPORTED_LOCATION_DEBUG "${FLANN_LIBRARY_DEBUG}")
     endif()
   endif()
+  # Pkgconfig may specify additional link libraries besides from FLANN itself
+  # in PC_FLANN_LIBRARIES, add them to the target link interface.
+  foreach(_library ${PC_FLANN_LIBRARIES})
+    if(NOT _library MATCHES "flann")
+      set_property(TARGET FLANN::FLANN APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${_library}")
+    endif()
+  endforeach()
   get_filename_component(FLANN_ROOT "${FLANN_INCLUDE_DIR}" PATH)
 endif()