From 5f77fef68d9f2f5ddc921432914dcbf92b31e989 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Thu, 8 Apr 2021 04:28:15 +0800
Subject: [fmt] Fix build error when building arm64-uwp (#16766)

* [fmt] Fix build error when building arm64-uwp

* update version record

* bump version

* update version record

* remove DISABLE_PARALLEL_CONFIGURE

* update version record
---
 ports/fmt/fix-write-batch.patch | 13 +++++++++++++
 ports/fmt/portfile.cmake        |  5 +++--
 ports/fmt/vcpkg.json            |  2 +-
 versions/baseline.json          |  2 +-
 versions/f-/fmt.json            |  5 +++++
 5 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 ports/fmt/fix-write-batch.patch

diff --git a/ports/fmt/fix-write-batch.patch b/ports/fmt/fix-write-batch.patch
new file mode 100644
index 000000000..7c17d6037
--- /dev/null
+++ b/ports/fmt/fix-write-batch.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f21cf45..691a632 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -157,7 +157,7 @@ if (MASTER_PROJECT AND CMAKE_GENERATOR MATCHES "Visual Studio")
+   join(netfxpath
+        "C:\\Program Files\\Reference Assemblies\\Microsoft\\Framework\\"
+        ".NETFramework\\v4.0")
+-  file(WRITE run-msbuild.bat "
++  file(WRITE ${CMAKE_BINARY_DIR}/run-msbuild.bat "
+     ${MSBUILD_SETUP}
+     ${CMAKE_MAKE_PROGRAM} -p:FrameworkPathOverride=\"${netfxpath}\" %*")
+ endif ()
diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake
index aef43b474..bdaa65876 100644
--- a/ports/fmt/portfile.cmake
+++ b/ports/fmt/portfile.cmake
@@ -4,12 +4,13 @@ vcpkg_from_github(
     REF 7bdf0628b1276379886c7f6dda2cef2b3b374f0b # v7.1.3
     SHA512 52ea8f9d2c0cb52ec3a740e38fcdfd6a0318566e3b599bd2e8d557168642d005c0a59bc213cff2641a88fed3bb771d15f46c39035ccd64809569af982aba47aa
     HEAD_REF master
-    PATCHES fix-warning4189.patch
+    PATCHES
+        fix-warning4189.patch
+        fix-write-batch.patch
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
-    DISABLE_PARALLEL_CONFIGURE # with MSBuild (on UWP), fmt writes into the source directory
     OPTIONS
         -DFMT_CMAKE_DIR=share/fmt
         -DFMT_TEST=OFF
diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json
index 880adf38b..591a93b1b 100644
--- a/ports/fmt/vcpkg.json
+++ b/ports/fmt/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "fmt",
   "version": "7.1.3",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.",
   "homepage": "https://github.com/fmtlib/fmt",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 341efc200..d792dd4a4 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2014,7 +2014,7 @@
     },
     "fmt": {
       "baseline": "7.1.3",
-      "port-version": 2
+      "port-version": 3
     },
     "folly": {
       "baseline": "2020.10.19.00",
diff --git a/versions/f-/fmt.json b/versions/f-/fmt.json
index 86345acc5..3576acbde 100644
--- a/versions/f-/fmt.json
+++ b/versions/f-/fmt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "943d63e7b912d94aab5db2c127ddc9a7ccf05c52",
+      "version": "7.1.3",
+      "port-version": 3
+    },
     {
       "git-tree": "71167ed3f3204ccfa0c7571ea5a89df1b113ed74",
       "version": "7.1.3",
-- 
cgit v1.2.3