diff options
| author | Dale Stammen <dalestam@microsoft.com> | 2018-05-16 17:09:19 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-05-16 17:09:19 -0700 |
| commit | 55322d464ea6af90925362e0572014f1cc298be5 (patch) | |
| tree | 5c3e27a5843113af546fd136283ec63332ef46b9 | |
| parent | 897eaf436fdda3902cde15f7d202e78c0da47140 (diff) | |
| download | vcpkg-55322d464ea6af90925362e0572014f1cc298be5.tar.gz vcpkg-55322d464ea6af90925362e0572014f1cc298be5.zip | |
added ignore 4703 warning to fix uwp builds (#3279)
* added ignore 4703 warning to fix uwp builds
* [protobuf] Bump version to include patchfile
| -rw-r--r-- | ports/protobuf/CONTROL | 2 | ||||
| -rw-r--r-- | ports/protobuf/fix-uwp.patch | 12 | ||||
| -rw-r--r-- | ports/protobuf/portfile.cmake | 1 |
3 files changed, 14 insertions, 1 deletions
diff --git a/ports/protobuf/CONTROL b/ports/protobuf/CONTROL index ba20ec0c9..8b149b051 100644 --- a/ports/protobuf/CONTROL +++ b/ports/protobuf/CONTROL @@ -1,5 +1,5 @@ Source: protobuf -Version: 3.5.1-3 +Version: 3.5.1-4 Description: Protocol Buffers - Google's data interchange format Feature: zlib diff --git a/ports/protobuf/fix-uwp.patch b/ports/protobuf/fix-uwp.patch new file mode 100644 index 000000000..ba09d5913 --- /dev/null +++ b/ports/protobuf/fix-uwp.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
+index 3afe376..1a0b6a7 100644
+--- a/cmake/CMakeLists.txt
++++ b/cmake/CMakeLists.txt
+@@ -151,6 +151,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.
++ /wd4703 # Potentially uninitialized local pointer variable 'name' used.
+ )
+ # Allow big object
+ add_definitions(/bigobj)
diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index cf30b97a1..f96b5240b 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -19,6 +19,7 @@ vcpkg_apply_patches( "${CMAKE_CURRENT_LIST_DIR}/001-add-compiler-flag.patch" "${CMAKE_CURRENT_LIST_DIR}/export-ParseGeneratorParameter.patch" "${CMAKE_CURRENT_LIST_DIR}/js-embed.patch" + "${CMAKE_CURRENT_LIST_DIR}/fix-uwp.patch" ) if(CMAKE_HOST_WIN32) |