]>
Commit | Line | Data |
---|---|---|
1e59de90 TL |
1 | diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in |
2 | index 9f78fcf..0cbe94f 100644 | |
3 | --- a/PCLConfig.cmake.in | |
4 | +++ b/PCLConfig.cmake.in | |
5 | @@ -396,25 +396,16 @@ file(TO_CMAKE_PATH "${PCL_DIR}" PCL_DIR) | |
6 | if(WIN32 AND NOT MINGW) | |
7 | # PCLConfig.cmake is installed to PCL_ROOT/cmake | |
8 | get_filename_component(PCL_ROOT "${PCL_DIR}" PATH) | |
9 | + get_filename_component(PCL_ROOT "${PCL_ROOT}" PATH) | |
10 | else() | |
11 | # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y | |
12 | get_filename_component(PCL_ROOT "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE) | |
13 | endif() | |
14 | ||
15 | # check whether PCLConfig.cmake is found into a PCL installation or in a build tree | |
16 | -if(EXISTS "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}/pcl/pcl_config.h") | |
17 | - # Found a PCL installation | |
18 | - # pcl_message("Found a PCL installation") | |
19 | - set(PCL_CONF_INCLUDE_DIR "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}") | |
20 | - set(PCL_LIBRARY_DIRS "${PCL_ROOT}/@LIB_INSTALL_DIR@") | |
21 | - if(EXISTS "${PCL_ROOT}/3rdParty") | |
22 | - set(PCL_ALL_IN_ONE_INSTALLER ON) | |
23 | - endif() | |
24 | -elseif(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h") | |
25 | - # Found a non-standard (likely ANDROID) PCL installation | |
26 | - # pcl_message("Found a PCL installation") | |
27 | +if(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h") | |
28 | set(PCL_CONF_INCLUDE_DIR "${PCL_ROOT}/include") | |
29 | - set(PCL_LIBRARY_DIRS "${PCL_ROOT}/lib") | |
30 | + set(PCL_LIBRARY_DIRS "${PCL_ROOT}/@LIB_INSTALL_DIR@" "${PCL_ROOT}/debug/@LIB_INSTALL_DIR@") | |
31 | if(EXISTS "${PCL_ROOT}/3rdParty") | |
32 | set(PCL_ALL_IN_ONE_INSTALLER ON) | |
33 | endif() |