Fixed Windows build with flann<1.8

This commit is contained in:
matlabbe
2015-09-09 16:36:59 -04:00
parent e78071b427
commit acc47fa9a9
3 changed files with 77 additions and 9 deletions

View File

@@ -132,8 +132,11 @@ option(WITH_GTSAM "Include GTSAM support" ON)
option(WITH_CVSBA "Include cvsba support" ON)
option(WITH_FLYCAPTURE2 "Include FlyCapture2/Triclops support" ON)
FIND_PACKAGE(FLANN 1.8)
SET(FLANN18_FOUND ${FLANN_FOUND})
find_package(PkgConfig QUIET)
FIND_PACKAGE(FLANN 1.8 QUIET)
IF(PkgConfig_FOUND AND FLANN_FOUND)
SET(FLANN18_FOUND TRUE)
ENDIF(PkgConfig_FOUND AND FLANN_FOUND)
FIND_PACKAGE(OpenCV REQUIRED)
FIND_PACKAGE(PCL 1.7 REQUIRED) # Will find FLANN too