diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2020-03-10 09:32:37 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2020-03-10 09:32:37 -0700 |
| commit | bbb14083f69cdd20d3df592f0902473ea4b547ea (patch) | |
| tree | 6c674ea6113d144898b3b0283f3e472f5e6d7497 /ports/upb/fix-uwp.patch | |
| parent | 670a2656df7ac34937ad4eb7c14eeba772954c9d (diff) | |
| parent | 7893f7c76c8f61d971b530b120a2261d80b85592 (diff) | |
| download | vcpkg-bbb14083f69cdd20d3df592f0902473ea4b547ea.tar.gz vcpkg-bbb14083f69cdd20d3df592f0902473ea4b547ea.zip | |
Merge remote-tracking branch 'origin/master' into dev/roschuma/grpc
Diffstat (limited to 'ports/upb/fix-uwp.patch')
| -rw-r--r-- | ports/upb/fix-uwp.patch | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/ports/upb/fix-uwp.patch b/ports/upb/fix-uwp.patch index b9fc02db7..91c45b416 100644 --- a/ports/upb/fix-uwp.patch +++ b/ports/upb/fix-uwp.patch @@ -1,15 +1,15 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6eb8bb5..1506a64 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,6 +13,10 @@ cmake_policy(SET CMP0048 NEW)
-
- project(upb)
-
-+add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-+if(MSVC)
-+ add_compile_options(/wd4146)
-+endif()
-
- # Prevent CMake from setting -rdynamic on Linux (!!).
- SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
+diff --git a/CMakeLists.txt b/CMakeLists.txt +index 577000a..759e35b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -58,6 +58,10 @@ elseif(UNIX) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id") + endif() + ++if (MSVC) ++ add_compile_options(/wd4146 -D_CRT_SECURE_NO_WARNINGS) ++endif() ++ + enable_testing() + add_library(descriptor_upbproto INTERFACE) + add_library(upb |