From 2f4952e1767ad5b0349a03ee56d676d226102381 Mon Sep 17 00:00:00 2001 From: raahilsha-z Date: Wed, 7 Jul 2021 15:59:12 -0400 Subject: [PATCH] pcl_config --- PCLConfig.cmake.in | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in index a1283a810..4137ed18c 100644 --- a/PCLConfig.cmake.in +++ b/PCLConfig.cmake.in @@ -384,6 +384,7 @@ 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) if(EXISTS "${PCL_ROOT}/3rdParty") set(PCL_ALL_IN_ONE_INSTALLER ON) endif() @@ -393,16 +394,9 @@ else() endif() # 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") - # 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}") - set(PCL_LIBRARY_DIRS "${PCL_ROOT}/@LIB_INSTALL_DIR@") -elseif(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h") - # Found a non-standard (likely ANDROID) PCL installation - # pcl_message("Found a PCL installation") +if(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h") set(PCL_CONF_INCLUDE_DIR "${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@") elseif(EXISTS "${PCL_DIR}/include/pcl/pcl_config.h") # Found PCLConfig.cmake in a build tree of PCL # pcl_message("PCL found into a build tree.") -- 2.32.0.windows.1