diff --git a/cmake/main.cmake b/cmake/main.cmake index c8017f5ee130..1d9ed38d87c2 100644 --- a/cmake/main.cmake +++ b/cmake/main.cmake @@ -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) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index eecd145edda1..d88cec7b3232 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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 diff --git a/src/v/hashing/CMakeLists.txt b/src/v/hashing/CMakeLists.txt index 1e79c9472bac..ee5f10d05288 100644 --- a/src/v/hashing/CMakeLists.txt +++ b/src/v/hashing/CMakeLists.txt @@ -8,7 +8,7 @@ v_cc_library( DEPS xxHash::xxhash Crc32c::crc32c - GnuTLS::gnutls + GnuTLS::GnuTLS DEFINES -DXXH_PRIVATE_API ) diff --git a/src/v/json/CMakeLists.txt b/src/v/json/CMakeLists.txt index 5f03a8b6e4ca..b542f5031930 100644 --- a/src/v/json/CMakeLists.txt +++ b/src/v/json/CMakeLists.txt @@ -4,6 +4,8 @@ v_cc_library( json.cc DEPS Seastar::seastar + RapidJSON::rapidjson + v::model ) add_subdirectory(tests) \ No newline at end of file diff --git a/src/v/reflection/test/CMakeLists.txt b/src/v/reflection/test/CMakeLists.txt index 31493075fe74..8a1402e3c4dd 100644 --- a/src/v/reflection/test/CMakeLists.txt +++ b/src/v/reflection/test/CMakeLists.txt @@ -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 )