diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-11-17 17:23:29 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-17 17:23:29 -0800 |
| commit | fcfa1e40da226ae820385407d50e5075c3011b3a (patch) | |
| tree | 46e1d0b1222a30fadc12bc4ea91035613be0d706 | |
| parent | 6b6fa2ab379d718656c2a0aa3044fae7b941a6fa (diff) | |
| parent | c7888a36e48383a0de3a86267dc9bbe3762f1f94 (diff) | |
| download | vcpkg-fcfa1e40da226ae820385407d50e5075c3011b3a.tar.gz vcpkg-fcfa1e40da226ae820385407d50e5075c3011b3a.zip | |
Merge pull request #2220 from UnaNancyOwen/fix_pcl
Change OpenNI2 to feature option
| -rw-r--r-- | ports/pcl/CONTROL | 8 | ||||
| -rw-r--r-- | ports/pcl/portfile.cmake | 7 |
2 files changed, 12 insertions, 3 deletions
diff --git a/ports/pcl/CONTROL b/ports/pcl/CONTROL index daadfa911..5d19f0021 100644 --- a/ports/pcl/CONTROL +++ b/ports/pcl/CONTROL @@ -1,7 +1,11 @@ Source: pcl -Version: 1.8.1-5 +Version: 1.8.1-6 Description: Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing. -Build-Depends: boost, eigen3, flann, qhull, vtk, openni2 +Build-Depends: boost, eigen3, flann, qhull, vtk + +Feature: openni2 +Description: OpenNI2 support for PCL +Build-Depends: openni2 Feature: qt Description: Qt support for PCL diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake index d63c9dfbb..a3efd3367 100644 --- a/ports/pcl/portfile.cmake +++ b/ports/pcl/portfile.cmake @@ -20,6 +20,11 @@ vcpkg_apply_patches( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PCL_SHARED_LIBS) +set(WITH_OPENNI2 OFF) +if("openni2" IN_LIST FEATURES) + set(WITH_OPENNI2 ON) +endif() + set(WITH_QT OFF) if("qt" IN_LIST FEATURES) set(WITH_QT ON) @@ -44,7 +49,7 @@ vcpkg_configure_cmake( # WITH -DWITH_CUDA=OFF -DWITH_LIBUSB=OFF - -DWITH_OPENNI2=ON + -DWITH_OPENNI2=${WITH_OPENNI2} -DWITH_PCAP=${WITH_PCAP} -DWITH_PNG=OFF -DWITH_QHULL=ON |