From a30a1ee743ae550c005214523948a39a25f3efad Mon Sep 17 00:00:00 2001
From: chausner <15180557+chausner@users.noreply.github.com>
Date: Wed, 29 Sep 2021 17:37:39 +0200
Subject: [numcpp] Update to 2.6.0 (#20397)

* Update numcpp to 2.6.0

* Update CI baseline

Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
---
 ports/numcpp/portfile.cmake | 20 ++++++++------------
 ports/numcpp/vcpkg.json     | 14 +++++++++++---
 2 files changed, 19 insertions(+), 15 deletions(-)

(limited to 'ports/numcpp')

diff --git a/ports/numcpp/portfile.cmake b/ports/numcpp/portfile.cmake
index d605b19da..e2dce207f 100644
--- a/ports/numcpp/portfile.cmake
+++ b/ports/numcpp/portfile.cmake
@@ -2,23 +2,19 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO dpilger26/NumCpp
-    REF fc68d897f8c2ae4f5b14baff3eefda897351abbd # 2.1.0
-    SHA512 ce407d9782d304658853cd66ba5901a4dc84d8cf74d45b2dd466ca6328f6bf60b39906efd5373624df6b46c4253f861208b15254d0e156fdb09f32ca731ad2bc
+    REF Version_2.6.0
+    SHA512 4D057941F4CB541CFAA56E4188C865DFC1804CA1B2203422B9EB7D7E8EE43CCB15DC5109DA5C932234E6055B6A5554D877347FA7CAEC5EA619A2975A56D2B16C
     HEAD_REF master
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS
-        -DNUMCPP_TEST=OFF
-        -DNUMCPP_EXAMPLES=OFF
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/NumCpp/cmake TARGET_PATH share/NumCpp)
+vcpkg_cmake_config_fixup(PACKAGE_NAME NumCpp CONFIG_PATH share/NumCpp/cmake)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
 
-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/numcpp/vcpkg.json b/ports/numcpp/vcpkg.json
index dab0d3abc..d93591882 100644
--- a/ports/numcpp/vcpkg.json
+++ b/ports/numcpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "numcpp",
-  "version-string": "2.1.0",
+  "version": "2.6.0",
   "description": "C++ implementation of the Python Numpy library",
   "homepage": "https://dpilger26.github.io/NumCpp",
   "license": "MIT",
@@ -11,11 +11,19 @@
     "boost-math",
     "boost-predef",
     "boost-random",
-    "boost-type-traits"
+    "boost-type-traits",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ],
   "features": {
     "python": {
-      "description": "Interacting with python with pybind11 interface",
+      "description": "Interacting with Python with pybind11 interface",
       "dependencies": [
         "boost-python",
         "pybind11"
-- 
cgit v1.2.3