Skip to content
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.

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

[build]: open-source build dependency updates #12811

Merged
merged 4 commits into from
Aug 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions cmake/main.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)

find_package(Valgrind REQUIRED)

# normalize dependency naming.
find_package(RapidJSON)
add_library(RapidJSON::rapidjson ALIAS rapidjson)

# add code
include(testing)
include(v_library)
Expand Down
10 changes: 10 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
find_package(Seastar REQUIRED)

# normalize the name of the gnutls dependency. when seastar is imported via a
# normal installation arrange for the library name given by seastar's find
# module to match the name from the system cmake find module for gnutls.
if (TARGET GnuTLS::gnutls)
add_library(GnuTLS::GnuTLS ALIAS GnuTLS::gnutls)
else()
find_package(GnuTLS)
endif()

find_package(Boost REQUIRED
COMPONENTS
iostreams
Expand Down
2 changes: 1 addition & 1 deletion src/v/hashing/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ v_cc_library(
DEPS
xxHash::xxhash
Crc32c::crc32c
GnuTLS::gnutls
GnuTLS::GnuTLS
DEFINES
-DXXH_PRIVATE_API
)
Expand Down
2 changes: 2 additions & 0 deletions src/v/json/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ v_cc_library(
json.cc
DEPS
Seastar::seastar
RapidJSON::rapidjson
v::model
)

add_subdirectory(tests)
2 changes: 1 addition & 1 deletion src/v/reflection/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ rp_test(
UNIT_TEST
BINARY_NAME adl_collections_interop
SOURCES collections_interop.cc
LIBRARIES v::seastar_testing_main absl::flat_hash_map v::reflection v::rprandom
LIBRARIES v::seastar_testing_main absl::flat_hash_map v::reflection v::rprandom v::model
LABELS reflection
)
Loading