update folly to v2023.11.20.00 (#2871)
* update folly to v2023.11.20.00 * pkgconfig patch * Fix patch csum * Enable reorder patch * Enable GLOG_NO_ABBREVIATED_SEVERITIES patch * MSVC patch * Fix patch csum * Do not apply useless patch * Clean uppull/2876/head
parent
7fed3ebea2
commit
ab2ee7af42
3 changed files with 34 additions and 0 deletions
@ -0,0 +1,13 @@ |
||||
diff --git a/CMake/FollyCompilerMSVC.cmake b/CMake/FollyCompilerMSVC.cmake
|
||||
--- a/CMake/FollyCompilerMSVC.cmake
|
||||
+++ b/CMake/FollyCompilerMSVC.cmake
|
||||
@@ -298,6 +298,9 @@ function(apply_folly_compile_options_to_target THETARGET)
|
||||
$<$<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.
|
||||
$<$<BOOL:${MSVC_ENABLE_LEAN_AND_MEAN_WINDOWS}>:WIN32_LEAN_AND_MEAN> # Don't include most of Windows.h
|
||||
$<$<BOOL:${MSVC_SUPPRESS_BOOST_CONFIG_OUTDATED}>:BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE> # MSVC moves faster than boost, so add a quick way to disable the messages.
|
||||
+
|
||||
+ NOMINMAX
|
||||
+ GLOG_NO_ABBREVIATED_SEVERITIES
|
||||
)
|
||||
|
||||
# Ignore a warning about an object file not defining any symbols,
|
@ -0,0 +1,18 @@ |
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -512,12 +512,12 @@ endif()
|
||||
|
||||
file(
|
||||
GENERATE
|
||||
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libfolly.pc
|
||||
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libfolly_$<CONFIG>.pc
|
||||
INPUT ${CMAKE_CURRENT_BINARY_DIR}/libfolly.pc.gen
|
||||
${target_arg}
|
||||
)
|
||||
install(
|
||||
- FILES ${CMAKE_CURRENT_BINARY_DIR}/libfolly.pc
|
||||
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/libfolly_${CMAKE_BUILD_TYPE}.pc
|
||||
DESTINATION ${LIB_INSTALL_DIR}/pkgconfig
|
||||
COMPONENT dev
|
||||
)
|
Loading…
Reference in new issue