From eeb8b41889bc990f1f42e5953a70a344a6e178cd Mon Sep 17 00:00:00 2001 From: John Freeman Date: Tue, 11 Jul 2023 16:26:15 -0500 Subject: [PATCH] Adapt to change in Conan recipe for NuDB (#4615) The recipe was updated a few days ago and the exported library target was renamed. --- CMakeLists.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index da2ea1a530..256f8dc7fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,7 +100,6 @@ target_link_libraries(ripple_libs INTERFACE ed25519::ed25519 LibArchive::LibArchive lz4::lz4 - nudb::core OpenSSL::Crypto OpenSSL::SSL Ripple::grpc_pbufs @@ -110,6 +109,16 @@ target_link_libraries(ripple_libs INTERFACE SQLite::SQLite3 ) +# Work around changes to Conan recipe for now. +if(TARGET nudb::core) + set(nudb nudb::core) +elseif(TARGET NuDB::nudb) + set(nudb NuDB::nudb) +else() + message(FATAL_ERROR "unknown nudb target") +endif() +target_link_libraries(ripple_libs INTERFACE ${nudb}) + if(reporting) find_package(cassandra-cpp-driver REQUIRED) find_package(PostgreSQL REQUIRED)