-
-
Notifications
You must be signed in to change notification settings - Fork 14.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
{folly,fizz,mvfst,wangle,fbthrift,fb303,edencommon,watchman}: 2024.12…
….09.00 -> 2025.01.06.00, add patches for glog ≥ 0.7.0 (#371610)
- Loading branch information
Showing
16 changed files
with
350 additions
and
60 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 8d7b3454df..2ce7b5af1a 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -50,8 +50,7 @@ | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/build/fbcode_builder/CMake" | ||
| ${CMAKE_MODULE_PATH}) | ||
|
|
||
| -find_package(Glog MODULE REQUIRED) | ||
| -include_directories(${GLOG_INCLUDE_DIR}) | ||
| +find_package(Glog CONFIG REQUIRED) | ||
|
|
||
| find_package(Gflags REQUIRED) | ||
| include_directories(${GFLAGS_INCLUDE_DIR}) | ||
| diff --git a/eden/common/testharness/CMakeLists.txt b/eden/common/testharness/CMakeLists.txt | ||
| index bef7421906..f35067efa9 100644 | ||
| --- a/eden/common/testharness/CMakeLists.txt | ||
| +++ b/eden/common/testharness/CMakeLists.txt | ||
| @@ -19,7 +19,7 @@ | ||
| ${BOOST_LIBRARIES} | ||
| Folly::folly_test_util | ||
| ${LIBGMOCK_LIBRARIES} | ||
| - ${GLOG_LIBRARY} | ||
| + glog::glog | ||
| ) | ||
|
|
||
| target_include_directories( |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 477b8d6a55..cfeae9ab3f 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -56,7 +56,7 @@ | ||
|
|
||
| find_package(Gflags REQUIRED) | ||
|
|
||
| -find_package(Glog MODULE REQUIRED) | ||
| +find_package(Glog CONFIG REQUIRED) | ||
|
|
||
| find_package(folly CONFIG REQUIRED) | ||
|
|
||
| @@ -88,7 +88,6 @@ | ||
|
|
||
| target_include_directories(fb303 PUBLIC | ||
| ${GFLAGS_INCLUDE_DIR} | ||
| - ${GLOG_INCLUDE_DIR} | ||
| ${DOUBLE_CONVERSION_INCLUDE_DIR} | ||
| $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}> | ||
| $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}> | ||
| @@ -98,6 +97,7 @@ | ||
| fb303_thrift_cpp | ||
| Folly::folly | ||
| FBThrift::thrift | ||
| + glog::glog | ||
| ) | ||
|
|
||
| install( |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index c6b2b2a810..1813c88e42 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -106,7 +106,7 @@ endif () | ||
| # Find required dependencies for thrift/lib | ||
| if (THRIFT_LIB_ONLY OR build_all) | ||
| find_package(Gflags REQUIRED) | ||
| - find_package(Glog REQUIRED) | ||
| + find_package(Glog CONFIG REQUIRED) | ||
| find_package(folly CONFIG REQUIRED) | ||
| find_package(fizz CONFIG REQUIRED) | ||
| find_package(wangle CONFIG REQUIRED) | ||
| @@ -119,7 +119,6 @@ if (THRIFT_LIB_ONLY OR build_all) | ||
| find_package(Threads) | ||
| include_directories( | ||
| ${LIBGFLAGS_INCLUDE_DIR} | ||
| - ${GLOG_INCLUDE_DIRS} | ||
| ${OPENSSL_INCLUDE_DIR} | ||
| ${ZSTD_INCLUDE_DIRS} | ||
| ${Xxhash_INCLUDE_DIR} | ||
| diff --git a/thrift/example/cpp2/CMakeLists.txt b/thrift/example/cpp2/CMakeLists.txt | ||
| index afa28dad61..318860b3d6 100644 | ||
| --- a/thrift/example/cpp2/CMakeLists.txt | ||
| +++ b/thrift/example/cpp2/CMakeLists.txt | ||
| @@ -28,7 +28,7 @@ target_link_libraries( | ||
| thriftcpp2 | ||
| chatroom-cpp2 | ||
| ${LIBGFLAGS_LIBRARY} | ||
| - ${GLOG_LIBRARIES} | ||
| + glog::glog | ||
| ) | ||
| install( | ||
| TARGETS example_server | ||
| diff --git a/thrift/lib/cpp/CMakeLists.txt b/thrift/lib/cpp/CMakeLists.txt | ||
| index 6461588a86..8b6ed1b030 100644 | ||
| --- a/thrift/lib/cpp/CMakeLists.txt | ||
| +++ b/thrift/lib/cpp/CMakeLists.txt | ||
| @@ -45,7 +45,7 @@ target_link_libraries( | ||
| PUBLIC | ||
| Folly::folly | ||
| ${LIBGFLAGS_LIBRARY} | ||
| - ${GLOG_LIBRARIES} | ||
| + glog::glog | ||
| ) | ||
|
|
||
| add_library( | ||
| @@ -121,7 +121,7 @@ target_link_libraries( | ||
| Boost::boost | ||
| Folly::folly | ||
| wangle::wangle | ||
| - ${GLOG_LIBRARIES} | ||
| + glog::glog | ||
| ${OPENSSL_LIBRARIES} | ||
| ) | ||
|
|
||
| @@ -137,7 +137,7 @@ target_link_libraries( | ||
| thriftprotocol | ||
| transport | ||
| Folly::folly | ||
| - ${GLOG_LIBRARIES} | ||
| + glog::glog | ||
| ) | ||
|
|
||
| set(THRIFT1_HEADER_DIRS | ||
| diff --git a/thrift/lib/cpp2/CMakeLists.txt b/thrift/lib/cpp2/CMakeLists.txt | ||
| index f941688ab0..b3609bbc62 100644 | ||
| --- a/thrift/lib/cpp2/CMakeLists.txt | ||
| +++ b/thrift/lib/cpp2/CMakeLists.txt | ||
| @@ -75,7 +75,7 @@ target_link_libraries( | ||
| Folly::folly | ||
| thriftmetadata | ||
| thriftprotocol | ||
| - ${GLOG_LIBRARIES} | ||
| + glog::glog | ||
| ${LIBGFLAGS_LIBRARY} | ||
| ) | ||
|
|
||
| @@ -206,7 +206,7 @@ target_link_libraries( | ||
| thrift | ||
| Folly::folly | ||
| wangle::wangle | ||
| - ${GLOG_LIBRARIES} | ||
| + glog::glog | ||
| thrift-core | ||
| ) | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt | ||
| index c60177c2b9..425326c529 100644 | ||
| --- a/fizz/CMakeLists.txt | ||
| +++ b/fizz/CMakeLists.txt | ||
| @@ -50,7 +50,7 @@ | ||
| find_package(fmt CONFIG REQUIRED) | ||
|
|
||
| find_package(OpenSSL REQUIRED) | ||
| -find_package(Glog REQUIRED) | ||
| +find_package(Glog CONFIG REQUIRED) | ||
| find_package(Threads REQUIRED) | ||
| find_package(Zstd REQUIRED) | ||
| if (UNIX AND NOT APPLE) | ||
| @@ -198,7 +198,6 @@ | ||
| ${sodium_INCLUDE_DIR} | ||
| ${ZSTD_INCLUDE_DIR} | ||
| PRIVATE | ||
| - ${GLOG_INCLUDE_DIRS} | ||
| ${FIZZ_INCLUDE_DIRECTORIES} | ||
| ) | ||
|
|
||
| @@ -212,7 +211,7 @@ | ||
| ZLIB::ZLIB | ||
| ${ZSTD_LIBRARY} | ||
| PRIVATE | ||
| - ${GLOG_LIBRARIES} | ||
| + glog::glog | ||
| ${GFLAGS_LIBRARIES} | ||
| ${FIZZ_LINK_LIBRARIES} | ||
| ${CMAKE_DL_LIBS} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index a878c7c473..c76c989f91 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -52,7 +52,7 @@ | ||
| find_package(fmt REQUIRED) | ||
| find_package(folly REQUIRED) | ||
| find_package(Fizz REQUIRED) | ||
| -find_package(Glog REQUIRED) | ||
| +find_package(Glog CONFIG REQUIRED) | ||
| find_package(Threads) | ||
|
|
||
| SET(GFLAG_DEPENDENCIES "") | ||
| diff --git a/cmake/QuicTest.cmake b/cmake/QuicTest.cmake | ||
| index e7d9f0c0c3..5f4525189c 100644 | ||
| --- a/cmake/QuicTest.cmake | ||
| +++ b/cmake/QuicTest.cmake | ||
| @@ -50,7 +50,7 @@ | ||
| target_link_libraries(${QUIC_TEST_TARGET} PUBLIC | ||
| "${QUIC_TEST_DEPENDS}" | ||
| ${LIBGMOCK_LIBRARIES} | ||
| - ${GLOG_LIBRARY} | ||
| + glog::glog | ||
| ) | ||
|
|
||
| # Per https://github.com/facebook/mvfst/pull/9, disable some warnings |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.