Skip to content

Commit

Permalink
[pcl] Update to PCL 1.9.0 (#4677)
Browse files Browse the repository at this point in the history
Update PCL port to PCL 1.9.0.
  • Loading branch information
UnaNancyOwen authored and ras0219-msft committed Nov 8, 2018
1 parent 9fe14bc commit efe7c7e
Show file tree
Hide file tree
Showing 12 changed files with 11 additions and 177 deletions.
2 changes: 1 addition & 1 deletion ports/pcl/CONTROL
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: pcl
Version: 1.8.1-12
Version: 1.9.0-1
Description: Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.
Build-Depends: eigen3, flann, qhull, vtk, libpng, boost-system, boost-filesystem, boost-thread, boost-date-time, boost-iostreams, boost-random, boost-foreach, boost-dynamic-bitset, boost-property-map, boost-graph, boost-multi-array, boost-signals2, boost-ptr-container, boost-uuid, boost-interprocess, boost-asio

Expand Down
13 changes: 0 additions & 13 deletions ports/pcl/boost_uuid_random_generator_compat.patch

This file was deleted.

25 changes: 0 additions & 25 deletions ports/pcl/cmakelists.patch

This file was deleted.

15 changes: 0 additions & 15 deletions ports/pcl/find_cuda.patch

This file was deleted.

11 changes: 1 addition & 10 deletions ports/pcl/find_flann.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/cmake/Modules/FindFLANN.cmake b/cmake/Modules/FindFLANN.cmake
index b5739dc95..d2c3fd07e 100644
index 1cecacfa9..3169d6d7b 100644
--- a/cmake/Modules/FindFLANN.cmake
+++ b/cmake/Modules/FindFLANN.cmake
@@ -10,8 +10,8 @@
Expand All @@ -13,12 +13,3 @@ index b5739dc95..d2c3fd07e 100644
else(FLANN_USE_STATIC)
set(FLANN_RELEASE_NAME flann_cpp)
set(FLANN_DEBUG_NAME flann_cpp-gd)
@@ -41,7 +41,7 @@ find_library(FLANN_LIBRARY_DEBUG
NAMES ${FLANN_DEBUG_NAME} ${FLANN_RELEASE_NAME}
HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}"
PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann"
- PATH_SUFFIXES lib)
+ PATH_SUFFIXES lib debug/lib)

if(NOT FLANN_LIBRARY_DEBUG)
set(FLANN_LIBRARY_DEBUG ${FLANN_LIBRARY})
12 changes: 0 additions & 12 deletions ports/pcl/find_openni2.patch

This file was deleted.

13 changes: 0 additions & 13 deletions ports/pcl/find_qhull.patch

This file was deleted.

26 changes: 4 additions & 22 deletions ports/pcl/config.patch → ports/pcl/pcl_config.patch
Original file line number Diff line number Diff line change
@@ -1,26 +1,8 @@
diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
index f4ef6a0ff..3a2c259dc 100644
index 7ec40baa0..837d78c82 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 lib 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 lib 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)
@@ -388,25 +388,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)
Expand Down Expand Up @@ -49,13 +31,13 @@ index f4ef6a0ff..3a2c259dc 100644
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")
@@ -416,9 +409,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")
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")

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/cmake/pcl_utils.cmake b/cmake/pcl_utils.cmake
index 69f1e76a4..37305815e 100644
index 41a64a269..a12718339 100644
--- a/cmake/pcl_utils.cmake
+++ b/cmake/pcl_utils.cmake
@@ -105,7 +105,7 @@ macro(SET_INSTALL_DIRS)
Expand Down
15 changes: 4 additions & 11 deletions ports/pcl/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,12 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO PointCloudLibrary/pcl
REF pcl-1.8.1
SHA512 9e7c87fb750a176712f08d215a906012c9e8174b687bbc8c08fa65de083b4468951bd8017b10409015d5eff0fc343885d2aae5c340346118b1a251af7bdd5cd7
REF pcl-1.9.0
SHA512 b2fb6cb1f8b4d203c711ac580e12946cacfba3f06bec95536e01705c63e709d488cee85d2a24b758c958972a0f4f3544a10a2c308ea637e9e23874e9de59becc
HEAD_REF master
PATCHES cmakelists.patch
config.patch
config_install.patch
PATCHES pcl_utils.patch
pcl_config.patch
find_flann.patch
find_qhull.patch
find_openni2.patch
find_cuda.patch
vs2017-15.4-workaround.patch
boost_uuid_random_generator_compat.patch
uuid-detail-sha1.patch
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PCL_SHARED_LIBS)
Expand Down
13 changes: 0 additions & 13 deletions ports/pcl/uuid-detail-sha1.patch

This file was deleted.

41 changes: 0 additions & 41 deletions ports/pcl/vs2017-15.4-workaround.patch

This file was deleted.

0 comments on commit efe7c7e

Please sign in to comment.