Remove patch and update tp latest folly release v2018.07.02.00

This commit is contained in:
Larry-Hu 2018-07-02 22:55:57 -07:00 committed by Alexander Karatarakis
parent 4ebdbe7e88
commit a300dfcc3a
2 changed files with 2 additions and 16 deletions

View File

@ -1,13 +0,0 @@
diff --git a/CMake/FollyCompilerMSVC.cmake b/CMake/FollyCompilerMSVC.cmake
index 0b97bfd..e442c73 100644
--- a/CMake/FollyCompilerMSVC.cmake
+++ b/CMake/FollyCompilerMSVC.cmake
@@ -268,7 +268,7 @@ function(apply_folly_compile_options_to_target THETARGET)
_CRT_NONSTDC_NO_WARNINGS # Don't deprecate posix names of functions.
_CRT_SECURE_NO_WARNINGS # Don't deprecate the non _s versions of various standard library functions, because safety is for chumps.
_SCL_SECURE_NO_WARNINGS # Don't deprecate the non _s versions of various standard library functions, because safety is for chumps.
-
+ _DISABLE_EXTENDED_ALIGNED_STORAGE
_STL_EXTRA_DISABLED_WARNINGS=4774\ 4987
$<$<BOOL:${MSVC_ENABLE_CPP_LATEST}>:_HAS_AUTO_PTR_ETC=1> # We're building in C++ 17 or greater mode, but certain dependencies (Boost) still have dependencies on unary_function and binary_function, so we have to make sure not to remove them.

View File

@ -17,12 +17,11 @@ set(ENV{PATH} "$ENV{PATH};${PYTHON3_DIR}")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/folly
REF v2018.06.25.00
SHA512 4961c02326005bcd82200f9e1b0b3d00c9afb60ed6dacdcc4f191095670122ea2fe33e91b3d638dc55664636af7c1b4f75b5f5c0c5cdfb0e8ca310ab28aa5ca3
REF v2018.07.02.00
SHA512 dcec94b3ab47deef124797bb2616544e4fba8b62ee8886d3b2c604534dafcca810ecf111b86032db15a9a77c89aa0139be047e2761e8df0d067dd72a584dcc13
HEAD_REF master
PATCHES
${CMAKE_CURRENT_LIST_DIR}/find-gflags.patch
${CMAKE_CURRENT_LIST_DIR}/fixC2338.patch
)
file(COPY