2017-06-15 06:46:30 +08:00
|
|
|
diff --git a/cmake/Modules/FindFLANN.cmake b/cmake/Modules/FindFLANN.cmake
|
2017-11-15 09:22:43 +08:00
|
|
|
index b5739dc95..d2c3fd07e 100644
|
2017-06-15 06:46:30 +08:00
|
|
|
--- a/cmake/Modules/FindFLANN.cmake
|
|
|
|
|
+++ b/cmake/Modules/FindFLANN.cmake
|
2017-07-15 05:25:23 +08:00
|
|
|
@@ -10,8 +10,8 @@
|
2017-06-15 06:46:30 +08:00
|
|
|
# look for shared ones
|
|
|
|
|
|
|
|
|
|
if(FLANN_USE_STATIC)
|
|
|
|
|
- set(FLANN_RELEASE_NAME flann_cpp_s)
|
|
|
|
|
- set(FLANN_DEBUG_NAME flann_cpp_s-gd)
|
|
|
|
|
+ set(FLANN_RELEASE_NAME flann_cpp)
|
2017-07-15 05:25:23 +08:00
|
|
|
+ set(FLANN_DEBUG_NAME flann_cpp-gd)
|
2017-06-15 06:46:30 +08:00
|
|
|
else(FLANN_USE_STATIC)
|
|
|
|
|
set(FLANN_RELEASE_NAME flann_cpp)
|
2017-07-15 05:25:23 +08:00
|
|
|
set(FLANN_DEBUG_NAME flann_cpp-gd)
|
2017-11-15 09:22:43 +08:00
|
|
|
@@ -41,7 +41,7 @@ find_library(FLANN_LIBRARY_DEBUG
|
|
|
|
|
NAMES ${FLANN_DEBUG_NAME} ${FLANN_RELEASE_NAME}
|
|
|
|
|
HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}"
|
|
|
|
|
PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann"
|
|
|
|
|
- PATH_SUFFIXES lib)
|
|
|
|
|
+ PATH_SUFFIXES lib debug/lib)
|
|
|
|
|
|
|
|
|
|
if(NOT FLANN_LIBRARY_DEBUG)
|
|
|
|
|
set(FLANN_LIBRARY_DEBUG ${FLANN_LIBRARY})
|
