Skip to content

Commit

Permalink
Merge pull request #5772 from mvieth/flann_optional
Browse files Browse the repository at this point in the history
Make Flann optional
  • Loading branch information
mvieth committed Jul 29, 2023
2 parents 11bcfa7 + 680c9a7 commit 3eabe5a
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -321,10 +321,14 @@ find_package(Threads REQUIRED)
# Eigen3 (required)
find_package(Eigen3 3.3 REQUIRED NO_MODULE)

# FLANN (required)
find_package(FLANN 1.9.1 REQUIRED)
if(NOT (${FLANN_LIBRARY_TYPE} MATCHES ${PCL_FLANN_REQUIRED_TYPE}) AND NOT (${PCL_FLANN_REQUIRED_TYPE} MATCHES "DONTCARE"))
message(FATAL_ERROR "Flann was selected with ${PCL_FLANN_REQUIRED_TYPE} but found as ${FLANN_LIBRARY_TYPE}")
# FLANN
find_package(FLANN 1.9.1)
if(NOT FLANN_FOUND)
message(WARNING "Flann was not found, so many PCL modules will not be built!")
else()
if(NOT (${FLANN_LIBRARY_TYPE} MATCHES ${PCL_FLANN_REQUIRED_TYPE}) AND NOT (${PCL_FLANN_REQUIRED_TYPE} MATCHES "DONTCARE"))
message(FATAL_ERROR "Flann was selected with ${PCL_FLANN_REQUIRED_TYPE} but found as ${FLANN_LIBRARY_TYPE}")
endif()
endif()

# libusb
Expand Down

0 comments on commit 3eabe5a

Please sign in to comment.