aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJackBoosY <47264268+JackBoosY@users.noreply.github.com>2019-08-16 02:47:13 +0800
committerVictor Romero <romerosanchezv@gmail.com>2019-08-15 11:47:13 -0700
commit514ad6542cc088a23b32e8e17a4defb2ddbed5b9 (patch)
tree7f476d27aae30393c76fbc54d001d8e29bc4fe22
parent0a899c4f686f2dbb53a6d2ed7ee5138834337b6c (diff)
downloadvcpkg-514ad6542cc088a23b32e8e17a4defb2ddbed5b9.tar.gz
vcpkg-514ad6542cc088a23b32e8e17a4defb2ddbed5b9.zip
[czmq/pcl]Fix judgment feature condition. (#7700)
-rw-r--r--ports/czmq/CONTROL2
-rw-r--r--ports/czmq/portfile.cmake2
-rw-r--r--ports/pcl/CONTROL2
-rw-r--r--ports/pcl/portfile.cmake2
4 files changed, 4 insertions, 4 deletions
diff --git a/ports/czmq/CONTROL b/ports/czmq/CONTROL
index c24d918e0..4d68f15b1 100644
--- a/ports/czmq/CONTROL
+++ b/ports/czmq/CONTROL
@@ -1,5 +1,5 @@
Source: czmq
-Version: 2019-06-10-2
+Version: 2019-06-10-3
Build-Depends: zeromq
Description: High-level C binding for ZeroMQ
Homepage: https://github.com/zeromq/czmq
diff --git a/ports/czmq/portfile.cmake b/ports/czmq/portfile.cmake
index 3c0e4c604..2545feea5 100644
--- a/ports/czmq/portfile.cmake
+++ b/ports/czmq/portfile.cmake
@@ -69,7 +69,7 @@ else()
set(EXECUTABLE_SUFFIX "")
endif()
-if (BUILD_TOOLS)
+if ("tool" IN_LIST FEATURES)
file(COPY ${CURRENT_PACKAGES_DIR}/bin/zmakecert${EXECUTABLE_SUFFIX}
DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
diff --git a/ports/pcl/CONTROL b/ports/pcl/CONTROL
index 3b40a6a4d..7d9e3a8db 100644
--- a/ports/pcl/CONTROL
+++ b/ports/pcl/CONTROL
@@ -1,5 +1,5 @@
Source: pcl
-Version: 1.9.1-7
+Version: 1.9.1-8
Homepage: https://github.com/PointCloudLibrary/pcl
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
diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake
index 591eeead9..aa4435dd5 100644
--- a/ports/pcl/portfile.cmake
+++ b/ports/pcl/portfile.cmake
@@ -56,7 +56,7 @@ vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-if(BUILD_TOOLS)
+if("tools" IN_LIST FEATURES)
file(GLOB EXEFILES_RELEASE ${CURRENT_PACKAGES_DIR}/bin/*.exe)
file(GLOB EXEFILES_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
file(COPY ${EXEFILES_RELEASE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/pcl)