aboutsummaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
Diffstat (limited to 'ports')
-rw-r--r--ports/fmt/fix-write-batch.patch13
-rw-r--r--ports/fmt/portfile.cmake5
-rw-r--r--ports/fmt/vcpkg.json2
3 files changed, 17 insertions, 3 deletions
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": [