From b4675fd65a5baebe93d0e60e082ae43013ed246f Mon Sep 17 00:00:00 2001
From: myd7349 <myd7349@gmail.com>
Date: Sat, 29 Jun 2019 01:17:39 +0800
Subject: [vcpkg] Add vcpkg_check_features (#6958)

* [vcpkg] Add vcpkg_check_feature, vcpkg_check_features

* [vcpkg] Remove vcpkg_check_feature

* [oniguruma,xtensor] Use vcpkg_check_features
---
 ports/xtensor/CONTROL        |  3 ++-
 ports/xtensor/portfile.cmake | 20 ++++++--------------
 2 files changed, 8 insertions(+), 15 deletions(-)

(limited to 'ports/xtensor')

diff --git a/ports/xtensor/CONTROL b/ports/xtensor/CONTROL
index 3e5e33013..138d9e1fe 100644
--- a/ports/xtensor/CONTROL
+++ b/ports/xtensor/CONTROL
@@ -1,6 +1,7 @@
 Source: xtensor
-Version: 0.20.7
+Version: 0.20.7-1
 Description: C++ tensors with broadcasting and lazy computing
+Homepage: https://quantstack.net/xtensor
 Build-Depends: nlohmann-json, xtl
 
 Feature: xsimd
diff --git a/ports/xtensor/portfile.cmake b/ports/xtensor/portfile.cmake
index 51e24c6e9..9c8b3b63e 100644
--- a/ports/xtensor/portfile.cmake
+++ b/ports/xtensor/portfile.cmake
@@ -5,29 +5,20 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO QuantStack/xtensor
-    REF 0.20.7
+    REF 0.20.7
     SHA512 de09900d0934f9b10453f16e43d1c3af28503f365224f9c6789b88a0cf00db820ca31e12099df1a2e3aafa73d7d83223df82f01b7611c1addb48367f936e5122
     HEAD_REF master
 )
 
-if("xsimd" IN_LIST FEATURES)
-    set(XTENSOR_USE_XSIMD ON)
-else()
-    set(XTENSOR_USE_XSIMD OFF)
-endif()
-
-if("tbb" IN_LIST FEATURES)
-    set(XTENSOR_USE_TBB ON)
-else()
-    set(XTENSOR_USE_TBB OFF)
-endif()
+vcpkg_check_features(
+    xsimd XTENSOR_USE_XSIMD
+    tbb XTENSOR_USE_TBB
+)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
-        -DXTENSOR_USE_XSIMD=${XTENSOR_USE_XSIMD}
-        -DXTENSOR_USE_TBB=${XTENSOR_USE_TBB}
         -DXTENSOR_ENABLE_ASSERT=OFF
         -DXTENSOR_CHECK_DIMENSION=OFF
         -DBUILD_TESTS=OFF
@@ -36,6 +27,7 @@ vcpkg_configure_cmake(
         -DDOWNLOAD_GBENCHMARK=OFF
         -DDEFAULT_COLUMN_MAJOR=OFF
         -DDISABLE_VS2017=OFF
+        ${FEATURE_OPTIONS}
 )
 
 vcpkg_install_cmake()
-- 
cgit v1.2.3