Skip to content

Fix Abseil CMake package name #152

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Abseil CMake package name #152

Show file tree
Hide file tree
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
20 changes: 10 additions & 10 deletions CMake/abseil.cmake → CMake/absl.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ include_guard(GLOBAL)
# TODO: these variables are named VELOX_* because we are piggy-backing on
# Velox's resolve dependency module for now. We should change and have our own
# in the future.
set(VELOX_ABSEIL_VERSION 20240116.0)
set(VELOX_ABSEIL_BUILD_SHA256_CHECKSUM
set(VELOX_ABSL_VERSION 20240116.0)
set(VELOX_ABSL_BUILD_SHA256_CHECKSUM
"338420448b140f0dfd1a1ea3c3ce71b3bc172071f24f4d9a57d59b45037da440")
set(VELOX_ABSEIL_SOURCE_URL
"https://github.com/abseil/abseil-cpp/archive/refs/tags/${VELOX_ABSEIL_VERSION}.tar.gz"
set(VELOX_ABSL_SOURCE_URL
"https://github.com/abseil/abseil-cpp/archive/refs/tags/${VELOX_ABSL_VERSION}.tar.gz"
)

velox_resolve_dependency_url(ABSEIL)
velox_resolve_dependency_url(ABSL)

message(STATUS "Building abseil from source")
message(STATUS "Building Abseil from source")

FetchContent_Declare(
abseil
URL ${VELOX_ABSEIL_SOURCE_URL}
URL_HASH ${VELOX_ABSEIL_BUILD_SHA256_CHECKSUM})
absl
URL ${VELOX_ABSL_SOURCE_URL}
URL_HASH ${VELOX_ABSL_BUILD_SHA256_CHECKSUM})

FetchContent_MakeAvailable(abseil)
FetchContent_MakeAvailable(absl)
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ velox_resolve_dependency(Boost 1.77.0 COMPONENTS ${BOOST_INCLUDE_LIBRARIES})
velox_set_source(folly)
velox_resolve_dependency(folly)

velox_set_source(abseil)
velox_resolve_dependency(abseil)
velox_set_source(absl)
velox_resolve_dependency(absl)

# Use xxhash and xsimd from Velox for now.
include_directories(.)
Expand Down
Loading