aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLily <47812810+LilyWangL@users.noreply.github.com>2020-01-07 06:46:57 +0800
committerdan-shaw <51385773+dan-shaw@users.noreply.github.com>2020-01-06 14:46:57 -0800
commit153cab79c76175118f5b5d28135a57e00ae75a8d (patch)
treea3757de382c30868208c64cfee589146790c13e3
parentd9bb748ac8ae8d984aa796d21487effc6da26f61 (diff)
downloadvcpkg-153cab79c76175118f5b5d28135a57e00ae75a8d.tar.gz
vcpkg-153cab79c76175118f5b5d28135a57e00ae75a8d.zip
[fmt] Disable warning C4189 on Visual Studio 2015 (#9121)
-rw-r--r--ports/fmt/CONTROL2
-rw-r--r--ports/fmt/fix-warning4189.patch12
-rw-r--r--ports/fmt/portfile.cmake2
3 files changed, 14 insertions, 2 deletions
diff --git a/ports/fmt/CONTROL b/ports/fmt/CONTROL
index bc6de38f8..cdbb9362d 100644
--- a/ports/fmt/CONTROL
+++ b/ports/fmt/CONTROL
@@ -1,4 +1,4 @@
Source: fmt
-Version: 6.0.0
+Version: 6.0.0-1
Homepage: https://github.com/fmtlib/fmt
Description: Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.
diff --git a/ports/fmt/fix-warning4189.patch b/ports/fmt/fix-warning4189.patch
new file mode 100644
index 000000000..9b52d4926
--- /dev/null
+++ b/ports/fmt/fix-warning4189.patch
@@ -0,0 +1,12 @@
+diff --git a/include/fmt/format.h b/include/fmt/format.h
+index efec5d6..9b15b48 100644
+--- a/include/fmt/format.h
++++ b/include/fmt/format.h
+@@ -33,6 +33,7 @@
+ #ifndef FMT_FORMAT_H_
+ #define FMT_FORMAT_H_
+
++#pragma warning(disable:4189)
+ #include <algorithm>
+ #include <cassert>
+ #include <cmath>
diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake
index 0809aaeb9..238272b86 100644
--- a/ports/fmt/portfile.cmake
+++ b/ports/fmt/portfile.cmake
@@ -1,10 +1,10 @@
-include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO fmtlib/fmt
REF 6.0.0
SHA512 7deb5bd843ae6b9d4b58dca9c68c1cfe7b55a41040f358247f5309655188d1ae194ff414437c068f74367f078faa214b5883e8c9e634c7623dcda50850e24766
HEAD_REF master
+ PATCHES fix-warning4189.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}