From 153cab79c76175118f5b5d28135a57e00ae75a8d Mon Sep 17 00:00:00 2001 From: Lily <47812810+LilyWangL@users.noreply.github.com> Date: Tue, 7 Jan 2020 06:46:57 +0800 Subject: [PATCH] [fmt] Disable warning C4189 on Visual Studio 2015 (#9121) --- ports/fmt/CONTROL | 2 +- ports/fmt/fix-warning4189.patch | 12 ++++++++++++ ports/fmt/portfile.cmake | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 ports/fmt/fix-warning4189.patch diff --git a/ports/fmt/CONTROL b/ports/fmt/CONTROL index bc6de38f877..cdbb9362d19 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 00000000000..9b52d492683 --- /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 + #include + #include diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index 0809aaeb9cb..238272b86d3 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}