diff options
| author | Tsukasa Sugiura <t.sugiura0204@gmail.com> | 2017-08-08 21:39:18 +0900 |
|---|---|---|
| committer | Tsukasa Sugiura <t.sugiura0204@gmail.com> | 2017-08-08 21:39:18 +0900 |
| commit | f80939510761f740275336bdeb95104dc44c97ca (patch) | |
| tree | e1de23ddd644fb30702a2fb486107ea3fb86ad23 | |
| parent | 5df9e1db7f73385bc64b9da6d1c46c33b10247e1 (diff) | |
| download | vcpkg-f80939510761f740275336bdeb95104dc44c97ca.tar.gz vcpkg-f80939510761f740275336bdeb95104dc44c97ca.zip | |
Update PCL 1.8.1
Update PCL 1.8.1
| -rw-r--r-- | ports/pcl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/pcl/portfile.cmake | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/ports/pcl/CONTROL b/ports/pcl/CONTROL index f13403e9a..a92e912de 100644 --- a/ports/pcl/CONTROL +++ b/ports/pcl/CONTROL @@ -1,4 +1,4 @@ Source: pcl -Version: 1.8.1rc2 +Version: 1.8.1 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/portfile.cmake b/ports/pcl/portfile.cmake index 7997ca300..8010d9c70 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.1rc2 - SHA512 e5bf069f0eacfaf068b37cb0d17bed65a83dddc30c0eaa2ef70bbc534ab1cfc690e581913cd39df6246ba73b5f76fb229d90e0c5b4971744f341f7d2abb57229 + REF pcl-1.8.1 + SHA512 9e7c87fb750a176712f08d215a906012c9e8174b687bbc8c08fa65de083b4468951bd8017b10409015d5eff0fc343885d2aae5c340346118b1a251af7bdd5cd7 HEAD_REF master ) @@ -29,23 +29,23 @@ vcpkg_apply_patches( "${CMAKE_CURRENT_LIST_DIR}/find_openni2.patch" ) -if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") - set(CRT_LINKAGE ON) -elseif(VCPKG_CRT_LINKAGE STREQUAL "static") - set(CRT_LINKAGE OFF) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(LIBRARY_LINKAGE ON) +elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(LIBRARY_LINKAGE OFF) endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - #PREFER_NINJA + PREFER_NINJA OPTIONS # BUILD -DBUILD_surface_on_nurbs=ON -DBUILD_tools=OFF # PCL - -DPCL_BUILD_WITH_BOOST_DYNAMIC_LINKING_WIN32=${CRT_LINKAGE} - -DPCL_BUILD_WITH_FLANN_DYNAMIC_LINKING_WIN32=${CRT_LINKAGE} - -DPCL_SHARED_LIBS=${CRT_LINKAGE} + -DPCL_BUILD_WITH_BOOST_DYNAMIC_LINKING_WIN32=${LIBRARY_LINKAGE} + -DPCL_BUILD_WITH_FLANN_DYNAMIC_LINKING_WIN32=${LIBRARY_LINKAGE} + -DPCL_SHARED_LIBS=${LIBRARY_LINKAGE} # WITH -DWITH_CUDA=OFF -DWITH_LIBUSB=OFF |