diff options
| author | Billy Robert O'Neal III <bion@microsoft.com> | 2020-08-28 16:31:27 -0700 |
|---|---|---|
| committer | Billy Robert O'Neal III <bion@microsoft.com> | 2020-08-28 16:31:27 -0700 |
| commit | c828f3634723996e6031fb2e3c3d1ac3f4de0cad (patch) | |
| tree | b3fe00a043d5b9351868a0d1f8aead41bb52d2be /ports/protobuf/fix-uwp.patch | |
| parent | 6635a2fa596ca457565eebc2a45664309cd24d77 (diff) | |
| parent | f3f329a048eaff759c1992c458f2e12351486bc7 (diff) | |
| download | vcpkg-c828f3634723996e6031fb2e3c3d1ac3f4de0cad.tar.gz vcpkg-c828f3634723996e6031fb2e3c3d1ac3f4de0cad.zip | |
Merge remote-tracking branch 'origin/master' into HEADupdate-geos-381
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 af3795df4..44f23579f 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 849679995..dba537a68 100644
+index 9ca31ac0b..237468c55 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
-@@ -198,6 +198,7 @@ if (MSVC)
+@@ -207,6 +207,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.
|