diff options
| author | John Spaith <jspaith@windows.microsoft.com> | 2019-10-10 09:36:18 -0700 |
|---|---|---|
| committer | John Spaith <jspaith@windows.microsoft.com> | 2019-10-10 09:36:18 -0700 |
| commit | 17c9b6bac8270b9740e5d824c6ebfff6cc7d5ed1 (patch) | |
| tree | 7baa6f699aa57601dbba4ace876fad45958878fc /ports/protobuf/fix-uwp.patch | |
| parent | 1d4189d1dde0fa8bbcbc6237cc33b85bca0512e1 (diff) | |
| parent | 2b049c47b5b2e003f8bcfe6707d4b0eaf8d1b569 (diff) | |
| download | vcpkg-17c9b6bac8270b9740e5d824c6ebfff6cc7d5ed1.tar.gz vcpkg-17c9b6bac8270b9740e5d824c6ebfff6cc7d5ed1.zip | |
Merge from master
Diffstat (limited to 'ports/protobuf/fix-uwp.patch')
| -rw-r--r-- | ports/protobuf/fix-uwp.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ports/protobuf/fix-uwp.patch b/ports/protobuf/fix-uwp.patch index ba09d5913..7a993c5c0 100644 --- a/ports/protobuf/fix-uwp.patch +++ b/ports/protobuf/fix-uwp.patch @@ -1,8 +1,8 @@ diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index 3afe376..1a0b6a7 100644
+index f87b0928e..5102a10e3 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
-@@ -151,6 +151,7 @@ if (MSVC)
+@@ -190,6 +190,7 @@ if (MSVC)
/wd4506 # no definition for inline function 'function'
/wd4800 # 'type' : forcing value to bool 'true' or 'false' (performance warning)
/wd4996 # The compiler encountered a deprecated declaration.
|