mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-26 14:21:47 +08:00
dd15e6f026
Fix bug when using "vcpkg integrate install" command by change directory structure to install the header files.
64 lines
3.0 KiB
Diff
64 lines
3.0 KiB
Diff
diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
|
|
index f4ef6a0ff..3a2c259dc 100644
|
|
--- a/PCLConfig.cmake.in
|
|
+++ b/PCLConfig.cmake.in
|
|
@@ -155,7 +155,7 @@ macro(find_qhull)
|
|
NAMES "@QHULL_LIBRARY_DEBUG_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 debug/lib)
|
|
|
|
find_package_handle_standard_args(qhull DEFAULT_MSG QHULL_LIBRARY QHULL_INCLUDE_DIRS)
|
|
|
|
@@ -443,7 +443,7 @@ macro(find_flann)
|
|
HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}"
|
|
PATHS "$ENV{PROGRAMFILES}/flann 1.6.9" "$ENV{PROGRAMW6432}/flann 1.6.9"
|
|
"$ENV{PROGRAMFILES}/flann" "$ENV{PROGRAMW6432}/flann"
|
|
- PATH_SUFFIXES lib)
|
|
+ PATH_SUFFIXES debug/lib)
|
|
|
|
find_package_handle_standard_args(Flann DEFAULT_MSG FLANN_LIBRARY FLANN_INCLUDE_DIRS)
|
|
if(FLANN_FOUND)
|
|
@@ -715,25 +715,18 @@ file(TO_CMAKE_PATH "${PCL_DIR}" PCL_DIR)
|
|
if(WIN32 AND NOT MINGW)
|
|
# PCLConfig.cmake is installed to PCL_ROOT/cmake
|
|
get_filename_component(PCL_ROOT "${PCL_DIR}" PATH)
|
|
+ get_filename_component(PCL_ROOT "${PCL_ROOT}" PATH)
|
|
else(WIN32 AND NOT MINGW)
|
|
# PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y
|
|
get_filename_component(PCL_ROOT "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
|
|
endif(WIN32 AND NOT MINGW)
|
|
|
|
# check whether PCLConfig.cmake is found into a PCL installation or in a build tree
|
|
-if(EXISTS "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}/pcl/pcl_config.h")
|
|
+if(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h")
|
|
# Found a PCL installation
|
|
# pcl_message("Found a PCL installation")
|
|
- set(PCL_INCLUDE_DIRS "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
|
|
- set(PCL_LIBRARY_DIRS "${PCL_ROOT}/@LIB_INSTALL_DIR@")
|
|
- if(EXISTS "${PCL_ROOT}/3rdParty")
|
|
- set(PCL_ALL_IN_ONE_INSTALLER ON)
|
|
- endif(EXISTS "${PCL_ROOT}/3rdParty")
|
|
-elseif(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h")
|
|
- # Found a non-standard (likely ANDROID) PCL installation
|
|
- # pcl_message("Found a PCL installation")
|
|
set(PCL_INCLUDE_DIRS "${PCL_ROOT}/include")
|
|
- set(PCL_LIBRARY_DIRS "${PCL_ROOT}/lib")
|
|
+ set(PCL_LIBRARY_DIRS "${PCL_ROOT}/@LIB_INSTALL_DIR@" "${PCL_ROOT}/debug/@LIB_INSTALL_DIR@")
|
|
if(EXISTS "${PCL_ROOT}/3rdParty")
|
|
set(PCL_ALL_IN_ONE_INSTALLER ON)
|
|
endif(EXISTS "${PCL_ROOT}/3rdParty")
|
|
@@ -743,9 +736,9 @@ elseif(EXISTS "${PCL_DIR}/include/pcl/pcl_config.h")
|
|
set(PCL_INCLUDE_DIRS "${PCL_DIR}/include") # for pcl_config.h
|
|
set(PCL_LIBRARY_DIRS "${PCL_DIR}/@LIB_INSTALL_DIR@")
|
|
set(PCL_SOURCES_TREE "@CMAKE_SOURCE_DIR@")
|
|
-else(EXISTS "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}/pcl/pcl_config.h")
|
|
+else(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h")
|
|
pcl_report_not_found("PCL can not be found on this machine")
|
|
-endif(EXISTS "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}/pcl/pcl_config.h")
|
|
+endif(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h")
|
|
|
|
#set a suffix for debug libraries
|
|
set(PCL_DEBUG_SUFFIX "@CMAKE_DEBUG_POSTFIX@")
|