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 | |
| parent | 670a2656df7ac34937ad4eb7c14eeba772954c9d (diff) | |
| parent | 7893f7c76c8f61d971b530b120a2261d80b85592 (diff) | |
| download | vcpkg-bbb14083f69cdd20d3df592f0902473ea4b547ea.tar.gz vcpkg-bbb14083f69cdd20d3df592f0902473ea4b547ea.zip | |
Merge remote-tracking branch 'origin/master' into dev/roschuma/grpc
| -rw-r--r-- | ports/folly/CONTROL | 2 | ||||
| -rw-r--r-- | ports/folly/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/upb/fix-uwp.patch | 30 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 2 |
4 files changed, 17 insertions, 18 deletions
diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL index 77c75a702..b4c11a45b 100644 --- a/ports/folly/CONTROL +++ b/ports/folly/CONTROL @@ -1,5 +1,5 @@ Source: folly -Version: 2019.10.21.00 +Version: 2019.10.21.00-1 Homepage: https://github.com/facebook/folly Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread, boost-smart-ptr diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index bfe4aa7e6..52645357a 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -87,6 +87,7 @@ FILE(WRITE ${CURRENT_PACKAGES_DIR}/share/folly/folly-config.cmake "include(CMakeFindDependencyMacro) find_dependency(Threads) find_dependency(glog CONFIG) +find_dependency(gflags CONFIG REQUIRED) ${_contents}") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) 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 diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d310daf71..0834ee62a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1784,8 +1784,6 @@ unrar:x64-linux=fail unrar:x64-osx=fail
unrar:x64-uwp=fail
unrar:x64-windows-static=fail
-upb:arm-uwp=fail
-upb:x64-uwp=fail
urdfdom:x64-windows-static=fail
usd:x64-linux=ignore
usd:x86-windows=fail
|