diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2017-08-10 13:56:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-10 13:56:07 -0700 |
| commit | a8359841a6b998c207ab8e0c18e63cb9e9a2e6cb (patch) | |
| tree | ec552809a69ac2603528657acf7bf1ee6835ab7d /ports/pcl/config.patch | |
| parent | d719443c67ce561325f3dfb311c8f9b7be088c1b (diff) | |
| parent | dd15e6f026fd3b55a724d57b16abeb7c0d37fa93 (diff) | |
| download | vcpkg-a8359841a6b998c207ab8e0c18e63cb9e9a2e6cb.tar.gz vcpkg-a8359841a6b998c207ab8e0c18e63cb9e9a2e6cb.zip | |
Merge pull request #1283 from UnaNancyOwen/add_pcl
Add PCL port
Diffstat (limited to 'ports/pcl/config.patch')
| -rw-r--r-- | ports/pcl/config.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/ports/pcl/config.patch b/ports/pcl/config.patch new file mode 100644 index 000000000..c949f128f --- /dev/null +++ b/ports/pcl/config.patch @@ -0,0 +1,63 @@ +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@") |