[vcpkg_check_features] Set output variable explicitly and allow reverse-logic check (#7558)

* [vcpkg_check_features] Set OUT_EXPAND_OPTIONS explicitly

* [vcpkg_check_features] Allow reverse logic for features

* [vcpkg_check_features] Document new parameters

* [vcpkg_check_features] Remove unnecessary logging

* Do not create variables for each feature only set OUT_FEATURE_OPTIONS

* Improve documentation

* Update ports that use vcpkg_check_features()

* Missing documentation updates

* [pcl] Fix tools feature

* [opencv,opencv4] Fix usage of vcpkg_check_features()

* [opencv4] Fix typo

25 files changed, 111 insertions, 138 deletions

diff --git a/ports/czmq/CONTROL b/ports/czmq/CONTROL
index 55cba0bd4..c24d918e0 100644
--- a/ports/czmq/CONTROL
+++ b/ports/czmq/CONTROL
@@ -1,5 +1,5 @@
 Source: czmq
-Version: 2019-06-10-1
+Version: 2019-06-10-2
 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 bba5e6e22..3c0e4c604 100644
--- a/ports/czmq/portfile.cmake
+++ b/ports/czmq/portfile.cmake
@@ -27,13 +27,13 @@ endforeach()
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
 
-vcpkg_check_features(
-    draft ENABLE_DRAFTS
-    tool BUILD_TOOLS
-    curl CZMQ_WITH_LIBCURL
-    httpd CZMQ_WITH_LIBMICROHTTPD
-    lz4 CZMQ_WITH_LZ4
-    uuid CZMQ_WITH_UUID
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    draft   ENABLE_DRAFTS
+    tool    BUILD_TOOLS
+    curl    CZMQ_WITH_LIBCURL
+    httpd   CZMQ_WITH_LIBMICROHTTPD
+    lz4     CZMQ_WITH_LZ4
+    uuid    CZMQ_WITH_UUID
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/darknet/CONTROL b/ports/darknet/CONTROL
index 812f66a2c..6979c310c 100644
--- a/ports/darknet/CONTROL
+++ b/ports/darknet/CONTROL
@@ -1,5 +1,5 @@
 Source: darknet
-Version: 0.2.5-5
+Version: 0.2.5-6
 Description: Darknet is an open source neural network framework written in C and CUDA. You only look once (YOLO) is a state-of-the-art, real-time object detection system, best example of darknet functionalities.
 Build-Depends: pthreads (windows), stb
 Default-Features: weights
@@ -19,5 +19,5 @@ Feature: weights-train
 Description: Download pre-built weights for training
 
 Feature: opencv-cuda
-Build-Depends: opencv[ffmpeg], opencv[cuda]
+Build-Depends: darknet[opencv], darknet[cuda]
 Description: Build darknet with support for a CUDA-enabled OpenCV
diff --git a/ports/darknet/portfile.cmake b/ports/darknet/portfile.cmake
index 83f68b6d7..a18c97a91 100644
--- a/ports/darknet/portfile.cmake
+++ b/ports/darknet/portfile.cmake
@@ -16,17 +16,12 @@ vcpkg_from_github(
   HEAD_REF master
 )
 
-vcpkg_check_features(
-  "cuda"    ENABLE_CUDA
-  "opencv"  ENABLE_OPENCV
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+  "cuda"  ENABLE_CUDA
+  "opencv" ENABLE_OPENCV
 )
 
-if("opencv-cuda" IN_LIST FEATURES)
-  set(ENABLE_OPENCV ON)
-  set(ENABLE_CUDA ON)
-endif()
-
-if (ENABLE_CUDA)
+if ("cuda" IN_LIST FEATURES)
   if (NOT VCPKG_CMAKE_SYSTEM_NAME AND NOT ENV{CUDACXX})
     #CMake looks for nvcc only in PATH and CUDACXX env vars for the Ninja generator. Since we filter path on vcpkg and CUDACXX env var is not set by CUDA installer on Windows, CMake cannot find CUDA when using Ninja generator, so we need to manually enlight it if necessary (https://gitlab.kitware.com/cmake/cmake/issues/19173). Otherwise we could just disable Ninja and use MSBuild, but unfortunately CUDA installer does not integrate with some distributions of MSBuild (like the ones inside Build Tools), making CUDA unavailable otherwise in those cases, which we want to avoid
     set(ENV{CUDACXX} "$ENV{CUDA_PATH}/bin/nvcc.exe")
@@ -80,8 +75,7 @@ vcpkg_configure_cmake(
   OPTIONS
     -DINSTALL_BIN_DIR:STRING=bin
     -DINSTALL_LIB_DIR:STRING=lib
-    -DENABLE_CUDA=${ENABLE_CUDA}
-    -DENABLE_OPENCV=${ENABLE_OPENCV}
+    ${FEATURE_OPTIONS}
 )
 
 vcpkg_install_cmake()
diff --git a/ports/librdkafka/portfile.cmake b/ports/librdkafka/portfile.cmake
index 84c50c8fa..c441c3c07 100644
--- a/ports/librdkafka/portfile.cmake
+++ b/ports/librdkafka/portfile.cmake
@@ -12,11 +12,11 @@ vcpkg_from_github(
 

 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RDKAFKA_BUILD_STATIC)

 

-vcpkg_check_features(

-    lz4 ENABLE_LZ4_EXT

-    ssl WITH_SSL

-    zlib WITH_ZLIB

-    zstd WITH_ZSTD

+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

+    lz4     ENABLE_LZ4_EXT

+    ssl     WITH_SSL

+    zlib    WITH_ZLIB

+    zstd    WITH_ZSTD

     snappy WITH_SNAPPY

 )

 

@@ -50,7 +50,7 @@ vcpkg_fixup_cmake_targets(
     TARGET_PATH share/rdkafka

 )

 

-if(ENABLE_LZ4_EXT)

+if("lz4" IN_LIST FEATURES)

     vcpkg_replace_string(

         ${CURRENT_PACKAGES_DIR}/share/rdkafka/RdKafkaConfig.cmake

         "find_dependency(LZ4)"

diff --git a/ports/mimalloc/CONTROL b/ports/mimalloc/CONTROL
index 127d64590..daf48d8ce 100644
--- a/ports/mimalloc/CONTROL
+++ b/ports/mimalloc/CONTROL
@@ -1,5 +1,5 @@
 Source: mimalloc

-Version: 2019-06-25

+Version: 2019-06-25-1

 Description: Compact general purpose allocator with excellent performance

 Homepage: https://github.com/microsoft/mimalloc

 

diff --git a/ports/mimalloc/portfile.cmake b/ports/mimalloc/portfile.cmake
index a520b3ba5..1a11284f5 100644
--- a/ports/mimalloc/portfile.cmake
+++ b/ports/mimalloc/portfile.cmake
@@ -10,10 +10,10 @@ vcpkg_from_github(
         fix-cmake.patch

 )

 

-vcpkg_check_features(

-    asm MI_SEE_ASM

-    secure MI_SECURE

-    override MI_OVERRIDE

+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

+    asm         MI_SEE_ASM

+    secure      MI_SECURE

+    override    MI_OVERRIDE

 )

 

 vcpkg_configure_cmake(

@@ -24,11 +24,9 @@ vcpkg_configure_cmake(
     OPTIONS_RELEASE

         -DMI_CHECK_FULL=OFF

     OPTIONS

-        -DMI_OVERRIDE=${MI_OVERRIDE}

         -DMI_INTERPOSE=ON

-        -DMI_SEE_ASM=${MI_SEE_ASM}

         -DMI_USE_CXX=OFF

-        -DMI_SECURE=${MI_SECURE}

+        ${FEATURE_OPTIONS}

 )

 

 vcpkg_install_cmake()

diff --git a/ports/mongo-c-driver/CONTROL b/ports/mongo-c-driver/CONTROL
index 77a40437f..eb52dacc8 100644
--- a/ports/mongo-c-driver/CONTROL
+++ b/ports/mongo-c-driver/CONTROL
@@ -1,5 +1,5 @@
 Source: mongo-c-driver
-Version: 1.14.0-3
+Version: 1.14.0-3-1
 Build-Depends: libbson, openssl (!windows), zlib
 Description: Client library written in C for MongoDB.
 Homepage: https://github.com/mongodb/mongo-c-driver
diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake
index 40d1effa8..9106fecb9 100644
--- a/ports/mongo-c-driver/portfile.cmake
+++ b/ports/mongo-c-driver/portfile.cmake
@@ -10,8 +10,8 @@ vcpkg_from_github(
     PATCHES fix-uwp.patch

 )

 

-vcpkg_check_features(

-    "snappy" MONGO_ENABLE_SNAPPY

+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

+    "snappy" ENABLE_SNAPPY

 )

 

 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")

@@ -38,8 +38,8 @@ vcpkg_configure_cmake(
         -DENABLE_SSL=${ENABLE_SSL}

         -DENABLE_ZLIB=SYSTEM

         -DENABLE_STATIC=${ENABLE_STATIC}

-        -DENABLE_SNAPPY=${MONGO_ENABLE_SNAPPY}

         -DBUILD_VERSION=${BUILD_VERSION}

+        ${FEATURE_OPTIONS}

 )

 

 vcpkg_install_cmake()

diff --git a/ports/oniguruma/CONTROL b/ports/oniguruma/CONTROL
index 768083b4e..6fe3ee2d0 100644
--- a/ports/oniguruma/CONTROL
+++ b/ports/oniguruma/CONTROL
@@ -1,5 +1,5 @@
 Source: oniguruma

-Version: 6.9.2-2

+Version: 6.9.2-3

 Description: Modern and flexible regular expressions library

 Homepage: https://github.com/kkos/oniguruma

 

diff --git a/ports/oniguruma/portfile.cmake b/ports/oniguruma/portfile.cmake
index 586bfbe07..5b2fe2adf 100644
--- a/ports/oniguruma/portfile.cmake
+++ b/ports/oniguruma/portfile.cmake
@@ -8,17 +8,16 @@ vcpkg_from_github(
     HEAD_REF master

 )

 

-if("non-posix" IN_LIST FEATURES)

-    set(ENABLE_POSIX_API OFF)

-else()

-    set(ENABLE_POSIX_API ON)

-endif()

+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

+    INVERTED_FEATURES

+        "non-posix" ENABLE_POSIX_API

+)

 

 vcpkg_configure_cmake(

     SOURCE_PATH ${SOURCE_PATH}

     PREFER_NINJA

     OPTIONS

-        -DENABLE_POSIX_API=${ENABLE_POSIX_API}

+        ${FEATURE_OPTIONS}

 )

 

 vcpkg_install_cmake()

diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL
index ccb7e4659..7b5ba5af9 100644
--- a/ports/opencv/CONTROL
+++ b/ports/opencv/CONTROL
@@ -1,8 +1,9 @@
 Source: opencv

-Version: 4.1.1

+Version: 4.1.1-1

 Homepage: https://github.com/opencv/opencv

 Description: Computer vision library

-Build-Depends: opencv4

+Build-Depends: opencv4[core]

+Default-Features: dnn, jpeg, opengl, png, tiff, webp

 

 Feature: nonfree

 Build-Depends: opencv4[nonfree]

diff --git a/ports/opencv4/CONTROL b/ports/opencv4/CONTROL
index 29d6ec9ce..ca52577c7 100644
--- a/ports/opencv4/CONTROL
+++ b/ports/opencv4/CONTROL
@@ -1,5 +1,5 @@
 Source: opencv4
-Version: 4.1.1
+Version: 4.1.1-1
 Build-Depends: protobuf, zlib
 Description: computer vision library
 Default-Features: dnn, jpeg, opengl, png, tiff, webp
diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake
index a1faafc71..efafab614 100644
--- a/ports/opencv4/portfile.cmake
+++ b/ports/opencv4/portfile.cmake
@@ -27,34 +27,53 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT)
 
 set(ADE_DIR ${CURRENT_INSTALLED_DIR}/share/ade CACHE PATH "Path to existing ADE CMake Config file")
 
-vcpkg_check_features(
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
  "ade"      WITH_ADE
  "contrib"  WITH_CONTRIB
  "cuda"     WITH_CUDA
+ "cuda"     WITH_CUBLAS
  "dnn"      BUILD_opencv_dnn
  "eigen"    WITH_EIGEN
  "ffmpeg"   WITH_FFMPEG
  "gdcm"     WITH_GDCM
  "halide"   WITH_HALIDE
- "ipp"      WITH_IPP
  "jasper"   WITH_JASPER
  "jpeg"     WITH_JPEG
  "nonfree"  OPENCV_ENABLE_NONFREE
  "openexr"  WITH_OPENEXR
  "opengl"   WITH_OPENGL
  "openmp"   WITH_OPENMP
- "ovis"     BUILD_opencv_ovis
  "png"      WITH_PNG
  "qt"       WITH_QT
  "sfm"      BUILD_opencv_sfm
- "tbb"      WITH_TBB
  "tiff"     WITH_TIFF
- "vtk"      WITH_VTK
  "webp"     WITH_WEBP
  "world"    BUILD_opencv_world
 )
 
-if(WITH_CUDA)
+# Cannot use vcpkg_check_features() for "ipp", "ovis", "tbb", and "vtk".
+# As the respective value of their variables can be unset conditionally.
+set(WITH_IPP OFF)
+if("ipp" IN_LIST FEATURES)
+  set(WITH_IPP ON)
+endif()
+
+set(BUILD_opencv_ovis OFF)
+if("ovis" IN_LIST FEATURES)
+  set(BUILD_opencv_ovis ON)
+endif()
+
+set(WITH_TBB OFF)
+if("tbb" IN_LIST FEATURES)
+  set(WITH_TBB ON)
+endif()
+
+set(WITH_VTK OFF)
+if("vtk" IN_LIST FEATURES)
+  set(WITH_VTK ON)
+endif()
+
+if("cuda" IN_LIST FEATURES)
   vcpkg_download_distfile(OCV_DOWNLOAD
       URLS "https://github.com/NVIDIA/NVIDIAOpticalFlowSDK/archive/79c6cee80a2df9a196f20afd6b598a9810964c32.zip"
       FILENAME "opencv-cache/nvidia_optical_flow/ca5acedee6cb45d0ec610a6732de5c15-79c6cee80a2df9a196f20afd6b598a9810964c32.zip"
@@ -64,7 +83,7 @@ endif()
 
 # Build image quality module when building with 'contrib' feature and not UWP.
 set(BUILD_opencv_quality OFF)
-if(WITH_CONTRIB)
+if("contrib" IN_LIST FEATURES)
   if (VCPKG_TARGET_IS_UWP)
     set(BUILD_opencv_quality OFF)
     message(WARNING "The image quality module (quality) does not build for UWP, the module has been disabled.")
@@ -144,7 +163,7 @@ if(WITH_CONTRIB)
   set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules")
 endif()
 
-if(BUILD_opencv_dnn)
+if("dnn" IN_LIST FEATURES)
   vcpkg_download_distfile(TINYDNN_ARCHIVE
     URLS "https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz"
     FILENAME "opencv-cache/tiny_dnn/adb1c512e09ca2c7a6faef36f9c53e59-v1.0.0a3.tar.gz"
@@ -238,7 +257,6 @@ vcpkg_configure_cmake(
         -DOPENCV_FFMPEG_USE_FIND_PACKAGE=FFMPEG
         -DCMAKE_DEBUG_POSTFIX=d
         ###### Ungrouped Entries
-        -DOPENCV_ENABLE_NONFREE=${OPENCV_ENABLE_NONFREE}
         -DBUILD_opencv_java=OFF
         -Dade_DIR=${ADE_DIR}
         ###### Disable build 3rd party libs
@@ -285,34 +303,17 @@ vcpkg_configure_cmake(
         ${BUILD_WITH_CONTRIB_FLAG}
         -DOPENCV_OTHER_INSTALL_PATH=share/opencv
         ###### customized properties
-        -DWITH_ADE=${WITH_ADE}
-        -DWITH_CUBLAS=${WITH_CUDA}
-        -DWITH_CUDA=${WITH_CUDA}
-        -DWITH_EIGEN=${WITH_EIGEN}
-        -DWITH_FFMPEG=${WITH_FFMPEG}
-        -DWITH_GDCM=${WITH_GDCM}
-        -DWITH_HALIDE=${WITH_HALIDE}
+        ## Options from vcpkg_check_features()
+        ${FEATURE_OPTIONS}
         -DWITH_IPP=${WITH_IPP}
-        -DWITH_JASPER=${WITH_JASPER}
-        -DWITH_JPEG=${WITH_JPEG}
         -DWITH_MSMF=${WITH_MSMF}
-        -DWITH_OPENEXR=${WITH_OPENEXR}
-        -DWITH_OPENGL=${WITH_OPENGL}
-        -DWITH_OPENMP=${WITH_OPENMP}
-        -DWITH_PNG=${WITH_PNG}
         -DWITH_PROTOBUF=ON
-        -DWITH_QT=${WITH_QT}
         -DWITH_TBB=${WITH_TBB}
-        -DWITH_TIFF=${WITH_TIFF}
         -DWITH_VTK=${WITH_VTK}
-        -DWITH_WEBP=${WITH_WEBP}
         ###### WITH PROPERTIES explicitly disabled, they have problems with libraries if already installed by user and that are "involuntarily" found during install
         -DWITH_LAPACK=OFF
         ###### BUILD_options (mainly modules which require additional libraries)
         -DBUILD_opencv_ovis=${BUILD_opencv_ovis}
-        -DBUILD_opencv_sfm=${BUILD_opencv_sfm}
-        -DBUILD_opencv_dnn=${BUILD_opencv_dnn}
-        -DBUILD_opencv_world=${BUILD_opencv_world}
         ###### The following modules are disabled for UWP
         -DBUILD_opencv_quality=${BUILD_opencv_quality}
 )
@@ -356,7 +357,7 @@ find_package(VTK QUIET)
 find_package(OpenMP QUIET)
 find_package(GDCM QUIET)" OPENCV_MODULES "${OPENCV_MODULES}")
 
-  if(WITH_OPENMP)
+  if("openmp" IN_LIST FEATURES)
     string(REPLACE "set_target_properties(opencv_core PROPERTIES
   INTERFACE_LINK_LIBRARIES \""
                    "set_target_properties(opencv_core PROPERTIES
diff --git a/ports/paho-mqttpp3/CONTROL b/ports/paho-mqttpp3/CONTROL
index 68f1867f6..7e3391668 100644
--- a/ports/paho-mqttpp3/CONTROL
+++ b/ports/paho-mqttpp3/CONTROL
@@ -1,5 +1,5 @@
 Source: paho-mqttpp3
-Version: 1.0.1
+Version: 1.0.1-1
 Description: Paho project provides open-source C++ wrapper for Paho C library
 Build-Depends: paho-mqtt
 Default-Features: ssl
diff --git a/ports/paho-mqttpp3/portfile.cmake b/ports/paho-mqttpp3/portfile.cmake
index dcc745d72..f91177ac0 100644
--- a/ports/paho-mqttpp3/portfile.cmake
+++ b/ports/paho-mqttpp3/portfile.cmake
@@ -9,7 +9,9 @@ vcpkg_from_github(
   HEAD_REF master
 )
 
-vcpkg_check_features("ssl" PAHO_WITH_SSL)
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS 
+  "ssl" PAHO_WITH_SSL
+)
 
 # Link with 'paho-mqtt3as' library
 set(PAHO_C_LIBNAME paho-mqtt3as)
@@ -48,8 +50,8 @@ vcpkg_configure_cmake(
   OPTIONS
   -DPAHO_BUILD_STATIC=${PAHO_MQTTPP3_STATIC}
   -DPAHO_BUILD_SHARED=${PAHO_MQTTPP3_SHARED}
-  -DPAHO_WITH_SSL=${PAHO_WITH_SSL}
   -DPAHO_MQTT_C_INCLUDE_DIRS=${PAHO_C_INC}
+  ${FEATURE_OPTIONS}
   ${PAHO_OPTIONS}
 )
 
diff --git a/ports/pcl/CONTROL b/ports/pcl/CONTROL
index 1cf828db4..3b40a6a4d 100644
--- a/ports/pcl/CONTROL
+++ b/ports/pcl/CONTROL
@@ -1,5 +1,5 @@
 Source: pcl
-Version: 1.9.1-6
+Version: 1.9.1-7
 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 6ef083351..591eeead9 100644
--- a/ports/pcl/portfile.cmake
+++ b/ports/pcl/portfile.cmake
@@ -18,13 +18,15 @@ file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindFLANN.cmake)
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PCL_SHARED_LIBS)
 
-vcpkg_check_features(
-    openni2 WITH_OPENNI2
-    qt WITH_QT
-    pcap WITH_PCAP
-    cuda WITH_CUDA
-    tools BUILD_TOOLS
-    opengl WITH_OPENGL
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    openni2     WITH_OPENNI2
+    qt          WITH_QT
+    pcap        WITH_PCAP
+    cuda        WITH_CUDA
+    cuda        BUILD_CUDA
+    cuda        BUILD_GPU
+    tools       BUILD_tools
+    opengl      WITH_OPENGL
 )
 
 vcpkg_configure_cmake(
@@ -33,24 +35,18 @@ vcpkg_configure_cmake(
     OPTIONS
         # BUILD
         -DBUILD_surface_on_nurbs=ON
-        -DBUILD_tools=${BUILD_TOOLS}
-        -DBUILD_CUDA=${WITH_CUDA}
-        -DBUILD_GPU=${WITH_CUDA} # build GPU when use CUDA
         # PCL
         -DPCL_BUILD_WITH_BOOST_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS}
         -DPCL_BUILD_WITH_FLANN_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS}
         -DPCL_BUILD_WITH_QHULL_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS}
         -DPCL_SHARED_LIBS=${PCL_SHARED_LIBS}
         # WITH
-        -DWITH_CUDA=${WITH_CUDA}
         -DWITH_LIBUSB=OFF
-        -DWITH_OPENNI2=${WITH_OPENNI2}
-        -DWITH_PCAP=${WITH_PCAP}
         -DWITH_PNG=ON
         -DWITH_QHULL=ON
-        -DWITH_QT=${WITH_QT}
         -DWITH_VTK=ON
-        -DWITH_OPENGL=${WITH_OPENGL}
+        # FEATURES
+        ${FEATURE_OPTIONS}
 )
 
 vcpkg_install_cmake()
diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake
index 535f3708c..e50a306fc 100644
--- a/ports/rocksdb/portfile.cmake
+++ b/ports/rocksdb/portfile.cmake
@@ -28,44 +28,22 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" WITH_MD_LIBRARY)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ROCKSDB_DISABLE_INSTALL_SHARED_LIB)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ROCKSDB_DISABLE_INSTALL_STATIC_LIB)
 
-set(WITH_LZ4 OFF)
-if("lz4" IN_LIST FEATURES)
-  set(WITH_LZ4 ON)
-endif()
-
-set(WITH_SNAPPY OFF)
-if("snappy" IN_LIST FEATURES)
-  set(WITH_SNAPPY ON)
-endif()
-
-set(WITH_ZLIB OFF)
-if("zlib" IN_LIST FEATURES)
-  set(WITH_ZLIB ON)
-endif()
-
-set(WITH_ZLIB OFF)
-if("zstd" IN_LIST FEATURES)
-  set(WITH_ZLIB ON)
-endif()
-
-set(WITH_TBB OFF)
-set(ROCKSDB_IGNORE_PACKAGE_TBB TRUE)
-if("tbb" IN_LIST FEATURES)
-  set(WITH_TBB ON)
-  set(ROCKSDB_IGNORE_PACKAGE_TBB FALSE)
-endif()
-
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+  FEATURES
+    "lz4"     WITH_LZ4
+    "snappy"  WITH_SNAPPY
+    "zlib"    WITH_ZLIB
+    "zstd"    WITH_ZSTD
+    "tbb"     WITH_TBB
+  INVERTED_FEATURES
+    "tbb"     CMAKE_DISABLE_FIND_PACKAGE_TBB
+)
 
 vcpkg_configure_cmake(
   SOURCE_PATH ${SOURCE_PATH}
   PREFER_NINJA
   OPTIONS
   -DWITH_GFLAGS=0
-  -DWITH_SNAPPY=${WITH_SNAPPY}
-  -DWITH_LZ4=${WITH_LZ4}
-  -DWITH_ZLIB=${WITH_ZLIB}
-  -DWITH_TBB=${WITH_TBB}
-  -DWITH_ZSTD=${WITH_ZSTD}
   -DWITH_TESTS=OFF
   -DUSE_RTTI=1
   -DROCKSDB_INSTALL_ON_WINDOWS=ON
@@ -75,10 +53,10 @@ vcpkg_configure_cmake(
   -DCMAKE_DEBUG_POSTFIX=d
   -DROCKSDB_DISABLE_INSTALL_SHARED_LIB=${ROCKSDB_DISABLE_INSTALL_SHARED_LIB}
   -DROCKSDB_DISABLE_INSTALL_STATIC_LIB=${ROCKSDB_DISABLE_INSTALL_STATIC_LIB}
-  -DCMAKE_DISABLE_FIND_PACKAGE_TBB=${ROCKSDB_IGNORE_PACKAGE_TBB}
   -DCMAKE_DISABLE_FIND_PACKAGE_NUMA=TRUE
   -DCMAKE_DISABLE_FIND_PACKAGE_gtest=TRUE
   -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE
+  ${FEATURE_OPTIONS}
 )
 
 vcpkg_install_cmake()
diff --git a/ports/xsimd/CONTROL b/ports/xsimd/CONTROL
index 6147d355c..dc442f858 100644
--- a/ports/xsimd/CONTROL
+++ b/ports/xsimd/CONTROL
@@ -1,5 +1,5 @@
 Source: xsimd

-Version: 7.2.3-1

+Version: 7.2.3-2

 Description: Modern, portable C++ wrappers for SIMD intrinsics

 Homepage: https://github.com/QuantStack/xsimd

 

diff --git a/ports/xsimd/portfile.cmake b/ports/xsimd/portfile.cmake
index 338afff45..ab293c408 100644
--- a/ports/xsimd/portfile.cmake
+++ b/ports/xsimd/portfile.cmake
@@ -10,16 +10,18 @@ vcpkg_from_github(
     HEAD_REF master

 )

 

-vcpkg_check_features(xcomplex ENABLE_XTL_COMPLEX)

+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

+    xcomplex ENABLE_XTL_COMPLEX

+)

 

 vcpkg_configure_cmake(

     SOURCE_PATH ${SOURCE_PATH}

     PREFER_NINJA

     OPTIONS

         -DENABLE_FALLBACK=OFF

-        -DENABLE_XTL_COMPLEX=${ENABLE_XTL_COMPLEX}

         -DBUILD_TESTS=OFF

         -DDOWNLOAD_GTEST=OFF

+        ${FEATURE_OPTIONS}

 )

 

 vcpkg_install_cmake()

diff --git a/ports/xtensor/CONTROL b/ports/xtensor/CONTROL
index 138d9e1fe..14df243d9 100644
--- a/ports/xtensor/CONTROL
+++ b/ports/xtensor/CONTROL
@@ -1,5 +1,5 @@
 Source: xtensor

-Version: 0.20.7-1

+Version: 0.20.7-2

 Description: C++ tensors with broadcasting and lazy computing

 Homepage: https://quantstack.net/xtensor

 Build-Depends: nlohmann-json, xtl

diff --git a/ports/xtensor/portfile.cmake b/ports/xtensor/portfile.cmake
index 9c8b3b63e..d30743a40 100644
--- a/ports/xtensor/portfile.cmake
+++ b/ports/xtensor/portfile.cmake
@@ -10,7 +10,7 @@ vcpkg_from_github(
     HEAD_REF master

 )

 

-vcpkg_check_features(

+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

     xsimd XTENSOR_USE_XSIMD

     tbb XTENSOR_USE_TBB

 )

diff --git a/ports/zeromq/CONTROL b/ports/zeromq/CONTROL
index 4a638759d..d0dbe6be9 100644
--- a/ports/zeromq/CONTROL
+++ b/ports/zeromq/CONTROL
@@ -1,5 +1,5 @@
 Source: zeromq
-Version: 2019-07-09
+Version: 2019-07-09-1
 Homepage: https://github.com/zeromq/libzmq
 Description: The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products
 
diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake
index 381bbccee..7f42cf521 100644
--- a/ports/zeromq/portfile.cmake
+++ b/ports/zeromq/portfile.cmake
@@ -11,7 +11,9 @@ vcpkg_from_github(
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
 
-vcpkg_check_features(sodium WITH_LIBSODIUM)
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    sodium WITH_LIBSODIUM
+)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
@@ -21,8 +23,8 @@ vcpkg_configure_cmake(
         -DPOLLER=select
         -DBUILD_STATIC=${BUILD_STATIC}
         -DBUILD_SHARED=${BUILD_SHARED}
-        -DWITH_LIBSODIUM=${WITH_LIBSODIUM}
         -DWITH_PERF_TOOL=OFF
+        ${FEATURE_OPTIONS}
     OPTIONS_DEBUG
         "-DCMAKE_PDB_OUTPUT_DIRECTORY=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
 )