Skip to content

Fixes in build files to allow a smooth macOS build #598

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

Open
hpnkv wants to merge 3 commits into
base: main
Choose a base branch
from
+13 −4
Open

Fixes in build files to allow a smooth macOS build #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8e090b
Fix subdir value for googletest to enable build.sh builds
hpnkv Feb 28, 2026
c55845c
Disable building fizz examples in build.sh
hpnkv Feb 28, 2026
313ab5d
Add a switch on c-ares package name and library name(space); specify …
hpnkv Feb 28, 2026
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
9 changes: 8 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,16 @@ find_package(Zstd REQUIRED)
find_package(ZLIB REQUIRED)
find_package(OpenSSL REQUIRED)
find_package(Threads)
find_package(Cares REQUIRED)
find_package(Glog REQUIRED)

set(CARES_PACKAGE_NAME Cares)
set(CARES_LIBRARY_NAME cares)
if (APPLE)
set(CARES_PACKAGE_NAME c-ares)
set(CARES_LIBRARY_NAME c-ares::cares)
endif (APPLE)
find_package(${CARES_PACKAGE_NAME} REQUIRED)

# Propagate glog's required compile definition to all proxygen targets.
# glog 0.7+ requires GLOG_USE_GLOG_EXPORT but since glog::glog is linked
# PRIVATE on the monolithic library, OBJECT libraries don't inherit it.
Expand Down
2 changes: 1 addition & 1 deletion build/fbcode_builder/manifests/googletest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ sha256 = 65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c

[build]
builder = cmake
subdir = googletest-1.17.0
subdir = googletest-v1.17.0

[cmake.defines]
# Everything else defaults to the shared runtime, so tell gtest that
Expand Down
2 changes: 2 additions & 0 deletions proxygen/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ function setup_zstd() {
mkdir -p "$ZSTD_BUILD_DIR"
cd "$ZSTD_BUILD_DIR" || exit
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_POLICY_VERSION_MINIMUM=3.10 \
-DBUILD_TESTS=OFF \
-DCMAKE_PREFIX_PATH="$ZSTD_INSTALL_DIR" \
-DCMAKE_INSTALL_PREFIX="$ZSTD_INSTALL_DIR" \
Expand Down Expand Up @@ -361,6 +362,7 @@ function setup_fizz() {
-DCMAKE_PREFIX_PATH="$DEPS_DIR" \
-DCMAKE_INSTALL_PREFIX="$DEPS_DIR" \
-DBUILD_TESTS=OFF \
-DBUILD_EXAMPLES=OFF \
"$MAYBE_USE_STATIC_DEPS" \
"$MAYBE_BUILD_SHARED_LIBS" \
"$MAYBE_OVERRIDE_CXX_FLAGS" \
Expand Down
4 changes: 2 additions & 2 deletions proxygen/lib/dns/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ proxygen_add_library(proxygen_dns_cares_dns
proxygen_utils_time_util
Folly::folly_conv
Folly::folly_portability_sockets
cares
${CARES_LIBRARY_NAME}
glog::glog
EXPORTED_DEPS
proxygen_dns_dns_base
Folly::folly_expected
Folly::folly_io_async_async_base
Folly::folly_network_address
Folly::folly_portability_windows
cares
${CARES_LIBRARY_NAME}
)

proxygen_add_library(proxygen_dns_future_dns
Expand Down