From d3ad95aabdf271fa338623b532cde533ee96a700 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 2 Mar 2022 05:57:27 +0800 Subject: [PATCH] [xtensor] Update to 0.24.0 (#23238) * [xtensor] update to version 0.24.0 * update version --- ports/xtensor/portfile.cmake | 17 ++++++++--------- ports/xtensor/vcpkg.json | 11 ++++++++++- versions/baseline.json | 2 +- versions/x-/xtensor.json | 5 +++++ 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/ports/xtensor/portfile.cmake b/ports/xtensor/portfile.cmake index a9be2459d9..dfaf6fc583 100644 --- a/ports/xtensor/portfile.cmake +++ b/ports/xtensor/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xtensor-stack/xtensor - REF f3c11b2d810159e7063daddeaa0764f4006e5a73 # 0.23.10 - SHA512 85d94a3e346a13f8d802260e7b182a34f83ed7adddb5c082f10fdaac995ba5b895ea20daf33ac99d3f44e9eb95fdc4ec051eb006259258c4c2ae762c5f08399f + REF 825c0fd8a465049c06ad89fa3911b342dbffcabf # 0.24.0 + SHA512 18b030efb88255108f3e2a0f5da9f082c32f2b637cb83fcabd5b579b0cff67b503d378037088c535497da09c00a5430ca87e737235b3b0b449da183925d99e68 HEAD_REF master ) @@ -14,9 +14,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS tbb XTENSOR_USE_TBB ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DXTENSOR_ENABLE_ASSERT=OFF -DXTENSOR_CHECK_DIMENSION=OFF @@ -29,10 +28,10 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/xtensor/vcpkg.json b/ports/xtensor/vcpkg.json index 439e46066c..dbd5083e58 100644 --- a/ports/xtensor/vcpkg.json +++ b/ports/xtensor/vcpkg.json @@ -1,10 +1,19 @@ { "name": "xtensor", - "version": "0.23.10", + "version": "0.24.0", "description": "C++ tensors with broadcasting and lazy computing", "homepage": "https://github.com/xtensor-stack/xtensor", + "license": "BSD-3-Clause", "dependencies": [ "nlohmann-json", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "xtl" ], "features": { diff --git a/versions/baseline.json b/versions/baseline.json index e836ec316e..086171f4b3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7469,7 +7469,7 @@ "port-version": 0 }, "xtensor": { - "baseline": "0.23.10", + "baseline": "0.24.0", "port-version": 0 }, "xtensor-blas": { diff --git a/versions/x-/xtensor.json b/versions/x-/xtensor.json index b175c89b57..3d91ce24be 100644 --- a/versions/x-/xtensor.json +++ b/versions/x-/xtensor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b7e23c44907ce8f4ca8cec01cb5534f092e74dda", + "version": "0.24.0", + "port-version": 0 + }, { "git-tree": "ca365f721479380995943c5ab4e8cdd6866ec785", "version": "0.23.10",