Skip to content

standalone: folly XLOG backend for bundled deps + override knobs #246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
gmarzot wants to merge 1 commit into
base: main
Choose a base branch
from
+51 −4
Draft

standalone: folly XLOG backend for bundled deps + override knobs #246

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 51 additions & 4 deletions standalone/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,14 +313,44 @@ FetchContent_Declare(fizz
GIT_TAG ${_FIZZ_REV}
)

# Allow overriding wangle repo/rev via -DWANGLE_REPO_OVERRIDE and
# -DWANGLE_REV_OVERRIDE
set(WANGLE_REPO_OVERRIDE "" CACHE STRING "Override wangle git repository URL")
set(WANGLE_REV_OVERRIDE "" CACHE STRING "Override wangle git revision")
if(WANGLE_REPO_OVERRIDE)
set(_WANGLE_REPO "${WANGLE_REPO_OVERRIDE}")
else()
set(_WANGLE_REPO "https://github.com/facebook/wangle.git")
endif()
if(WANGLE_REV_OVERRIDE)
set(_WANGLE_REV "${WANGLE_REV_OVERRIDE}")
else()
set(_WANGLE_REV "${WANGLE_REV}")
endif()

FetchContent_Declare(wangle
GIT_REPOSITORY https://github.com/facebook/wangle.git
GIT_TAG ${WANGLE_REV}
GIT_REPOSITORY ${_WANGLE_REPO}
GIT_TAG ${_WANGLE_REV}
)

# Allow overriding mvfst repo/rev via -DMVFST_REPO_OVERRIDE and
# -DMVFST_REV_OVERRIDE
set(MVFST_REPO_OVERRIDE "" CACHE STRING "Override mvfst git repository URL")
set(MVFST_REV_OVERRIDE "" CACHE STRING "Override mvfst git revision")
if(MVFST_REPO_OVERRIDE)
set(_MVFST_REPO "${MVFST_REPO_OVERRIDE}")
else()
set(_MVFST_REPO "https://github.com/facebook/mvfst.git")
endif()
if(MVFST_REV_OVERRIDE)
set(_MVFST_REV "${MVFST_REV_OVERRIDE}")
else()
set(_MVFST_REV "${MVFST_REV}")
endif()

FetchContent_Declare(mvfst
GIT_REPOSITORY https://github.com/facebook/mvfst.git
GIT_TAG ${MVFST_REV}
GIT_REPOSITORY ${_MVFST_REPO}
GIT_TAG ${_MVFST_REV}
)

# Allow overriding proxygen repo/rev via -DPROXYGEN_REPO_OVERRIDE and
Expand Down Expand Up @@ -388,6 +418,23 @@ endmacro()

include(${CMAKE_CURRENT_SOURCE_DIR}/apply-patches.cmake)

# --- Logging backend for bundled Meta deps (openmoq/moqx#339) ---
# Drive each dep's logging shim toward folly XLOG so the bundled standalone
# build produces a homogeneous xlog stack. Each cache var below is a
# forward-compatible no-op until the corresponding upstream shim lands AND
# the dep's rev pin advances past that merge:
# - fizz: facebookincubator/fizz#168 (LANDED)
# - wangle: facebook/wangle#252 (OPEN)
# - mvfst: facebook/mvfst#456 (OPEN)
# - proxygen: afrind WIP, no PR yet (add PRX_LOGGING_* here when up)
option(MOXYGEN_LOGGING_FOLLY_XLOG
"Configure bundled Meta deps (fizz/wangle/mvfst) to use folly XLOG" ON)
if(MOXYGEN_LOGGING_FOLLY_XLOG)
set(FIZZ_LOGGING_FOLLY_LOGGING ON CACHE BOOL "" FORCE)
set(WANGLE_LOGGING_FOLLY_LOGGING ON CACHE BOOL "" FORCE)
set(MVFST_LOGGING_BACKEND "XLOG" CACHE STRING "" FORCE)
endif()

# When BUNDLE_DEPS or INSTALL_DEPS is ON, build all dep targets so they can be
# installed. BUNDLE_DEPS additionally prefers static system libs for distribution.
if(BUNDLE_DEPS OR INSTALL_DEPS)
Expand Down
Loading