diff options
| author | Tsukasa Sugiura <t.sugiura0204@gmail.com> | 2017-07-20 09:14:15 +0900 |
|---|---|---|
| committer | Tsukasa Sugiura <t.sugiura0204@gmail.com> | 2017-07-20 09:14:15 +0900 |
| commit | 5df9e1db7f73385bc64b9da6d1c46c33b10247e1 (patch) | |
| tree | bc2237e84651d5a2164e8c73645361c3bd8b40f3 | |
| parent | d1c44edbe1fa26a670a3f6262fc58f3c06d13eb0 (diff) | |
| download | vcpkg-5df9e1db7f73385bc64b9da6d1c46c33b10247e1.tar.gz vcpkg-5df9e1db7f73385bc64b9da6d1c46c33b10247e1.zip | |
Update PCL 1.8.1 RC2
Update PCL 1.8.1 RC2
| -rw-r--r-- | ports/pcl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/pcl/config.patch | 4 | ||||
| -rw-r--r-- | ports/pcl/portfile.cmake | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ports/pcl/CONTROL b/ports/pcl/CONTROL index 1c7c8e7f2..f13403e9a 100644 --- a/ports/pcl/CONTROL +++ b/ports/pcl/CONTROL @@ -1,4 +1,4 @@ Source: pcl -Version: 1.8.1rc1-1 +Version: 1.8.1rc2 Build-Depends: boost, eigen3, flann, qhull, vtk, openni2, qt5 Description: Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing. diff --git a/ports/pcl/config.patch b/ports/pcl/config.patch index e3df7cd18..d95f89dac 100644 --- a/ports/pcl/config.patch +++ b/ports/pcl/config.patch @@ -1,5 +1,5 @@ diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in -index f3089dfec..67ba5297c 100644 +index f4ef6a0ff..63c01c6d2 100644 --- a/PCLConfig.cmake.in +++ b/PCLConfig.cmake.in @@ -155,7 +155,7 @@ macro(find_qhull) @@ -27,7 +27,7 @@ index f3089dfec..67ba5297c 100644 + get_filename_component(PCL_ROOT "${PCL_ROOT}" PATH) else(WIN32 AND NOT MINGW) # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y - set(PCL_ROOT "@CMAKE_INSTALL_PREFIX@") + get_filename_component(PCL_ROOT "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE) @@ -725,7 +726,7 @@ if(EXISTS "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}/pcl # Found a PCL installation # pcl_message("Found a PCL installation") diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake index 193a051a5..7997ca300 100644 --- a/ports/pcl/portfile.cmake +++ b/ports/pcl/portfile.cmake @@ -15,8 +15,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PointCloudLibrary/pcl - REF pcl-1.8.1rc1 - SHA512 c719f7ff8cc5be3cfb5f01c89727e94858ed0cf5d50e2b884599e4a5b289564b4e2843979406b62adee1f2cee7332195dcd6219e99accef5700f3119758eb53f + REF pcl-1.8.1rc2 + SHA512 e5bf069f0eacfaf068b37cb0d17bed65a83dddc30c0eaa2ef70bbc534ab1cfc690e581913cd39df6246ba73b5f76fb229d90e0c5b4971744f341f7d2abb57229 HEAD_REF master ) @@ -43,8 +43,8 @@ vcpkg_configure_cmake( -DBUILD_surface_on_nurbs=ON -DBUILD_tools=OFF # PCL - -DPCL_BUILD_WITH_BOOST_DYNAMIC_LINKING_WIN32=ON - -DPCL_BUILD_WITH_FLANN_DYNAMIC_LINKING_WIN32=ON + -DPCL_BUILD_WITH_BOOST_DYNAMIC_LINKING_WIN32=${CRT_LINKAGE} + -DPCL_BUILD_WITH_FLANN_DYNAMIC_LINKING_WIN32=${CRT_LINKAGE} -DPCL_SHARED_LIBS=${CRT_LINKAGE} # WITH -DWITH_CUDA=OFF |