From d369df7ecf194005eaca46f07368779cd486badd Mon Sep 17 00:00:00 2001
From: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
Date: Wed, 14 Jul 2021 14:45:18 -0500
Subject: [rollup:2021-07-06] Rollup PR (#18838)

* [rollup:2021-07-06 1/8] PR #18272 (@strega-nil)

[scripts-audit] vcpkg_from_*

* [rollup:2021-07-06 2/8] PR #18319 (@strega-nil)

[scripts-audit] add guidelines for cmake

* [rollup 2021-07-06 3/8] PR #18410 (@mheyman)

[vcpkg-cmake-config] documentation fix

* [rollup:2021-07-06 4/8] PR #18488 (@strega-nil)

[scripts-audit] vcpkg_execute_*

* [rollup:2021-07-06 5/8] PR #18517 (@strega-nil)

[scripts-audit] vcpkg_extract_source_archive

* [rollup:2021-07-06 6/8] PR #18674 (@NancyLi1013)

[vcpkg doc] Update examples

* [rollup:2021-07-06 7/8] PR #18695 (@JackBoosY)

[vcpkg] Update the minimum version of vcpkg

* [rollup:2021-07-06 8/8] PR #18758 (@ras0219-msft)

[vcpkg_from_git] Fix error if downloads folder does not exist

* build docs!

* fix bond:*-windows

* fix nmap

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: Michael Heyman <Michael.Heyman@jhuapl.edu>
Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Robert Schumacher <ras0219@outlook.com>
---
 ports/qcustomplot/CONTROL        |  4 ----
 ports/qcustomplot/portfile.cmake |  4 +++-
 ports/qcustomplot/vcpkg.json     | 12 ++++++++++++
 3 files changed, 15 insertions(+), 5 deletions(-)
 delete mode 100644 ports/qcustomplot/CONTROL
 create mode 100644 ports/qcustomplot/vcpkg.json

(limited to 'ports/qcustomplot')

diff --git a/ports/qcustomplot/CONTROL b/ports/qcustomplot/CONTROL
deleted file mode 100644
index ec7dac08f..000000000
--- a/ports/qcustomplot/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: qcustomplot
-Version: 2.0.1-4
-Description: QCustomPlot is a Qt C++ widget for plotting and data visualization.
-Build-Depends: qt5-base[core]
diff --git a/ports/qcustomplot/portfile.cmake b/ports/qcustomplot/portfile.cmake
index b180d8bd7..026f62fb3 100644
--- a/ports/qcustomplot/portfile.cmake
+++ b/ports/qcustomplot/portfile.cmake
@@ -16,7 +16,9 @@ vcpkg_download_distfile(ARCHIVE
     FILENAME "QCustomPlot-sharedlib-${QCP_VERSION}.tar.gz"
     SHA512 ce90540fca7226eac37746327e1939a9c7af38fc2595f385ed04d6d1f49560da08fb5fae15d1b9d22b6ba578583f70de8f89ef26796770d41bf599c1b15c535d
 )
-vcpkg_extract_source_archive(${ARCHIVE} ${SOURCE_PATH})
+vcpkg_extract_source_archive(SharedLib_SOURCE_PATH ARCHIVE "${ARCHIVE}")
+file(RENAME "${SharedLib_SOURCE_PATH}" "${SOURCE_PATH}/qcustomplot-sharedlib")
+
 
 vcpkg_configure_qmake(SOURCE_PATH
     ${SOURCE_PATH}/qcustomplot-sharedlib/sharedlib-compilation/sharedlib-compilation.pro
diff --git a/ports/qcustomplot/vcpkg.json b/ports/qcustomplot/vcpkg.json
new file mode 100644
index 000000000..6d2c2c665
--- /dev/null
+++ b/ports/qcustomplot/vcpkg.json
@@ -0,0 +1,12 @@
+{
+  "name": "qcustomplot",
+  "version": "2.0.1",
+  "port-version": 5,
+  "description": "QCustomPlot is a Qt C++ widget for plotting and data visualization.",
+  "dependencies": [
+    {
+      "name": "qt5-base",
+      "default-features": false
+    }
+  ]
+}
-- 
cgit v1.2.3