From 8329d995cfcd4b29ffb95ef16265ccdcdab64052 Mon Sep 17 00:00:00 2001
From: chausner <15180557+chausner@users.noreply.github.com>
Date: Tue, 23 Nov 2021 21:16:04 +0100
Subject: [PATCH] [cxxopts] Update to 3.0.0 (#21607)

* Update cxxopts to 3.0.0

* Update CI baseline

Co-authored-by: chausner <chausner@users.noreply.github.com>
---
 ports/cxxopts/fix-uwp-error.patch | 13 -------------
 ports/cxxopts/portfile.cmake      | 24 ++++++++++++------------
 ports/cxxopts/vcpkg.json          | 15 ++++++++++++---
 versions/baseline.json            |  4 ++--
 versions/c-/cxxopts.json          |  5 +++++
 5 files changed, 31 insertions(+), 30 deletions(-)
 delete mode 100644 ports/cxxopts/fix-uwp-error.patch

diff --git a/ports/cxxopts/fix-uwp-error.patch b/ports/cxxopts/fix-uwp-error.patch
deleted file mode 100644
index da1d455957..0000000000
--- a/ports/cxxopts/fix-uwp-error.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 440490b..0ceb003 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -54,6 +54,8 @@ endif()
- 
- add_library(cxxopts INTERFACE)
- 
-+add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-+
- # optionally, enable unicode support using the ICU library
- set(CXXOPTS_USE_UNICODE_HELP FALSE CACHE BOOL "Use ICU Unicode library")
- if(CXXOPTS_USE_UNICODE_HELP)
diff --git a/ports/cxxopts/portfile.cmake b/ports/cxxopts/portfile.cmake
index 552e877d28..51626b190e 100644
--- a/ports/cxxopts/portfile.cmake
+++ b/ports/cxxopts/portfile.cmake
@@ -1,25 +1,25 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jarro2783/cxxopts
-    REF 302302b30839505703d37fb82f536c53cf9172fa # v2.2.1
-    SHA512 ba4fe586772979929e090310557b1cba66c7350593ae170e3c7bd6577cf147b20dbe3ba834f2ed6e1044a1b38d5166bfd0491ab573df68e678ff2dc792a3c442
+    REF v3.0.0
+    SHA512 239479a3b35ddef6fc380ac9371e1cf7e3aea066f03e1ea538151fa2fff4296838daa976d55e988d8f87f40c0ae027767bcb214754177499413af1081315565c
     HEAD_REF master
-    PATCHES
-    fix-uwp-error.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DCXXOPTS_BUILD_EXAMPLES=OFF
-		-DCXXOPTS_BUILD_TESTS=OFF
+        -DCXXOPTS_BUILD_TESTS=OFF
+        -DCXXOPTS_ENABLE_WARNINGS=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cxxopts)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cxxopts)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
+vcpkg_fixup_pkgconfig()
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cxxopts RENAME copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib")
+
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/cxxopts" RENAME copyright)
diff --git a/ports/cxxopts/vcpkg.json b/ports/cxxopts/vcpkg.json
index 213f5cefcc..1a5c7506a5 100644
--- a/ports/cxxopts/vcpkg.json
+++ b/ports/cxxopts/vcpkg.json
@@ -1,7 +1,16 @@
 {
   "name": "cxxopts",
-  "version-string": "2.2.1",
-  "port-version": 1,
+  "version-semver": "3.0.0",
   "description": "This is a lightweight C++ option parser library, supporting the standard GNU style syntax for options",
-  "homepage": "https://github.com/jarro2783/cxxopts"
+  "homepage": "https://github.com/jarro2783/cxxopts",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index a3627f3b89..f38969c8e7 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1721,8 +1721,8 @@
       "port-version": 0
     },
     "cxxopts": {
-      "baseline": "2.2.1",
-      "port-version": 1
+      "baseline": "3.0.0",
+      "port-version": 0
     },
     "czmq": {
       "baseline": "4.2.1",
diff --git a/versions/c-/cxxopts.json b/versions/c-/cxxopts.json
index 26e43e9907..f26aab12ae 100644
--- a/versions/c-/cxxopts.json
+++ b/versions/c-/cxxopts.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "803dd21f8c06b5460353b53501f273b6c30aa9df",
+      "version-semver": "3.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "68001132d5d7e495c5890f3cadfed62aba7185dd",
       "version-string": "2.2.1",