[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
This commit is contained in:
Jack·Boos·Yu 2021-04-08 04:28:15 +08:00 committed by GitHub
parent b3aaa1c3b7
commit 5f77fef68d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 4 deletions

View File

@ -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 ()

View File

@ -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

View File

@ -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": [

View File

@ -2014,7 +2014,7 @@
},
"fmt": {
"baseline": "7.1.3",
"port-version": 2
"port-version": 3
},
"folly": {
"baseline": "2020.10.19.00",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "943d63e7b912d94aab5db2c127ddc9a7ccf05c52",
"version": "7.1.3",
"port-version": 3
},
{
"git-tree": "71167ed3f3204ccfa0c7571ea5a89df1b113ed74",
"version": "7.1.3",