mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 18:31:15 +08:00
[folly] update to v2018.11.26 and fix linux build (#4832)
This commit is contained in:
parent
f3b5ed1d24
commit
e943161971
@ -1,5 +1,5 @@
|
||||
Source: folly
|
||||
Version: 2018.11.05.00
|
||||
Version: 2018.11.26.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
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
@ -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 v2018.11.26.00
|
||||
SHA512 7a404df7287c9a3278bc47205023881ade188a1d3ade35748ae9ae4f35485faedc9f8c0264cfd0f3565b2d5891235deda0f515946a2c313570ef41751a3693ac
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
find-gflags.patch
|
||||
|
Loading…
x
Reference in New Issue
Block a user