Merge pull request #2085 from UnaNancyOwen/fix_cmake

Add search path suffixes for Vcpkg
PointCloudLibrary · Nov 15, 2017 · b0dcfb5 · b0dcfb5
2 parents ecaa617 + 93f583e
commit b0dcfb5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/cmake/Modules/FindFLANN.cmake b/cmake/Modules/FindFLANN.cmake
@@ -35,13 +35,13 @@ find_library(FLANN_LIBRARY
              NAMES ${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)
 
 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)
+             HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}"
+             PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann" 
+             PATH_SUFFIXES lib debug/lib)
 
 if(NOT FLANN_LIBRARY_DEBUG)
   set(FLANN_LIBRARY_DEBUG ${FLANN_LIBRARY})

diff --git a/cmake/Modules/FindOpenNI2.cmake b/cmake/Modules/FindOpenNI2.cmake
@@ -51,6 +51,7 @@ endif(WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 8)
 find_path(OPENNI2_INCLUDE_DIR OpenNI.h
           PATHS "$ENV{OPENNI2_INCLUDE${OPENNI2_SUFFIX}}"  # Win64 needs '64' suffix
                 "/usr/include/openni2"                    # common path for deb packages
+          PATH_SUFFIXES include/openni2
 )
 
 find_library(OPENNI2_LIBRARY

diff --git a/cmake/Modules/FindQhull.cmake b/cmake/Modules/FindQhull.cmake
@@ -55,7 +55,7 @@ find_library(QHULL_LIBRARY_DEBUG
              NAMES ${QHULL_DEBUG_NAME} ${QHULL_RELEASE_NAME}
              HINTS "${QHULL_ROOT}" "$ENV{QHULL_ROOT}"
              PATHS "$ENV{PROGRAMFILES}/QHull" "$ENV{PROGRAMW6432}/QHull" 
-             PATH_SUFFIXES project build bin lib)
+             PATH_SUFFIXES project build bin lib debug/lib)
 
 if(NOT QHULL_LIBRARY_DEBUG)
   set(QHULL_LIBRARY_DEBUG ${QHULL_LIBRARY})