2017-06-15 06:46:30 +08:00
|
|
|
diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
|
2020-08-19 06:20:22 +08:00
|
|
|
index 9f78fcf..0cbe94f 100644
|
2017-06-15 06:46:30 +08:00
|
|
|
--- a/PCLConfig.cmake.in
|
|
|
|
+++ b/PCLConfig.cmake.in
|
2020-08-19 06:20:22 +08:00
|
|
|
@@ -396,25 +396,16 @@ file(TO_CMAKE_PATH "${PCL_DIR}" PCL_DIR)
|
2017-06-15 06:46:30 +08:00
|
|
|
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)
|
2020-08-19 06:20:22 +08:00
|
|
|
else()
|
2017-06-15 06:46:30 +08:00
|
|
|
# PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y
|
2017-07-20 08:14:15 +08:00
|
|
|
get_filename_component(PCL_ROOT "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
|
2020-08-19 06:20:22 +08:00
|
|
|
endif()
|
2017-08-11 02:07:08 +08:00
|
|
|
|
|
|
|
# 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")
|
2020-08-19 06:20:22 +08:00
|
|
|
- # Found a PCL installation
|
|
|
|
- # pcl_message("Found a PCL installation")
|
|
|
|
- set(PCL_CONF_INCLUDE_DIR "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
|
2017-06-15 06:46:30 +08:00
|
|
|
- set(PCL_LIBRARY_DIRS "${PCL_ROOT}/@LIB_INSTALL_DIR@")
|
2017-08-11 02:07:08 +08:00
|
|
|
- if(EXISTS "${PCL_ROOT}/3rdParty")
|
|
|
|
- set(PCL_ALL_IN_ONE_INSTALLER ON)
|
2020-08-19 06:20:22 +08:00
|
|
|
- endif()
|
2017-08-11 02:07:08 +08:00
|
|
|
-elseif(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h")
|
|
|
|
- # Found a non-standard (likely ANDROID) PCL installation
|
|
|
|
- # pcl_message("Found a PCL installation")
|
2020-08-19 06:20:22 +08:00
|
|
|
+if(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h")
|
|
|
|
set(PCL_CONF_INCLUDE_DIR "${PCL_ROOT}/include")
|
2017-08-11 02:07:08 +08:00
|
|
|
- set(PCL_LIBRARY_DIRS "${PCL_ROOT}/lib")
|
2017-06-15 06:46:30 +08:00
|
|
|
+ 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)
|
2020-08-19 06:20:22 +08:00
|
|
|
endif()
|