Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/grdowns/4802

4 files changed, 28 insertions, 28 deletions

diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL
index f8842fec4..d5dd6754a 100644
--- a/ports/folly/CONTROL
+++ b/ports/folly/CONTROL
@@ -1,5 +1,5 @@
 Source: folly
-Version: 2018.11.05.00
+Version: 2019.01.28.00
 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
 Default-Features: zlib
diff --git a/ports/folly/find-gflags.patch b/ports/folly/find-gflags.patch
index 986dd6d57..a3e011683 100644
--- a/ports/folly/find-gflags.patch
+++ b/ports/folly/find-gflags.patch
@@ -1,13 +1,13 @@
-diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake

-index 396fa6c..9d80d99 100644

---- a/CMake/folly-deps.cmake

-+++ b/CMake/folly-deps.cmake

-@@ -22,7 +22,7 @@ list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})

- list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})

- 

- set(FOLLY_HAVE_LIBGFLAGS OFF)

--find_package(GFlags CONFIG QUIET)

-+find_package(gflags CONFIG REQUIRED)

- if (gflags_FOUND)

-   message(STATUS "Found gflags from package config")

-   set(FOLLY_HAVE_LIBGFLAGS ON)

+diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
+index 437c0cd..5530a35 100644
+--- a/CMake/folly-deps.cmake
++++ b/CMake/folly-deps.cmake
+@@ -22,7 +22,7 @@ list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
+ 
+ set(FOLLY_HAVE_LIBGFLAGS OFF)
+-find_package(gflags CONFIG QUIET)
++find_package(gflags CONFIG REQUIRED)
+ if (gflags_FOUND)
+   message(STATUS "Found gflags from package config")
+   set(FOLLY_HAVE_LIBGFLAGS ON)
diff --git a/ports/folly/no-werror.patch b/ports/folly/no-werror.patch
index e9ec920dc..32fbc9494 100644
--- a/ports/folly/no-werror.patch
+++ b/ports/folly/no-werror.patch
@@ -1,12 +1,12 @@
-diff --git a/CMake/FollyCompilerUnix.cmake b/CMake/FollyCompilerUnix.cmake

-index b7d994b..a518cbe 100644

---- a/CMake/FollyCompilerUnix.cmake

-+++ b/CMake/FollyCompilerUnix.cmake

-@@ -16,7 +16,6 @@ function(apply_folly_compile_options_to_target THETARGET)

-       -std=gnu++14

-       -finput-charset=UTF-8

-       -fsigned-char

--      -Werror

-       -Wall

-       -Wno-deprecated

-       -Wdeprecated-declarations

+diff --git a/CMake/FollyCompilerUnix.cmake b/CMake/FollyCompilerUnix.cmake
+index a9cc2c1..de7d714 100644
+--- a/CMake/FollyCompilerUnix.cmake
++++ b/CMake/FollyCompilerUnix.cmake
+@@ -34,7 +34,6 @@ function(apply_folly_compile_options_to_target THETARGET)
+       -std=${CXX_STD}
+       -finput-charset=UTF-8
+       -fsigned-char
+-      -Werror
+       -Wall
+       -Wno-deprecated
+       -Wno-deprecated-declarations
diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
index bb15bf859..72b3485ff 100644
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@@ -17,8 +17,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/folly
-    REF v2018.11.05.00
-    SHA512 08eee201c2b1179a4e52398cc65964fb299abfb95934687f4ce3d72df1ff70493964835d5e52c8821c63553e0be0d578e1130e50e353a7eab6b0334532e4df2e
+    REF v2019.01.28.00
+    SHA512 cdd32d863bd98b31332fbcb25a548407857ffd8e611fb5d243821f43fcf240cb796fb4520dddec5537f398c10492e1ecb03de22f7ec0384b98411e9906f40d09
     HEAD_REF master
     PATCHES
         find-gflags.patch