Skip to content

Commit cc955d3

Browse files
authored
Only set PCL_ALL_IN_ONE_INSTALLER on Windows (#4821)
On Linux PCL_ROOT is set to /usr and so we are testing for /usr/3rdParty which could exist independently of PCL. Reported in https://bugs.launchpad.net/ubuntu/+source/pcl/+bug/1928819
1 parent 2d7ebf1 commit cc955d3

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

PCLConfig.cmake.in

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,9 @@ file(TO_CMAKE_PATH "${PCL_DIR}" PCL_DIR)
384384
if(WIN32 AND NOT MINGW)
385385
# PCLConfig.cmake is installed to PCL_ROOT/cmake
386386
get_filename_component(PCL_ROOT "${PCL_DIR}" PATH)
387+
if(EXISTS "${PCL_ROOT}/3rdParty")
388+
set(PCL_ALL_IN_ONE_INSTALLER ON)
389+
endif()
387390
else()
388391
# PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y
389392
get_filename_component(PCL_ROOT "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
@@ -395,17 +398,11 @@ if(EXISTS "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}/pcl
395398
# pcl_message("Found a PCL installation")
396399
set(PCL_CONF_INCLUDE_DIR "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
397400
set(PCL_LIBRARY_DIRS "${PCL_ROOT}/@LIB_INSTALL_DIR@")
398-
if(EXISTS "${PCL_ROOT}/3rdParty")
399-
set(PCL_ALL_IN_ONE_INSTALLER ON)
400-
endif()
401401
elseif(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h")
402402
# Found a non-standard (likely ANDROID) PCL installation
403403
# pcl_message("Found a PCL installation")
404404
set(PCL_CONF_INCLUDE_DIR "${PCL_ROOT}/include")
405405
set(PCL_LIBRARY_DIRS "${PCL_ROOT}/lib")
406-
if(EXISTS "${PCL_ROOT}/3rdParty")
407-
set(PCL_ALL_IN_ONE_INSTALLER ON)
408-
endif()
409406
elseif(EXISTS "${PCL_DIR}/include/pcl/pcl_config.h")
410407
# Found PCLConfig.cmake in a build tree of PCL
411408
# pcl_message("PCL found into a build tree.")

0 commit comments

Comments
 (0)