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.

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

Adapt to change in Conan recipe for NuDB #4615

Merged
merged 4 commits into from
Jul 11, 2023
Merged

Adapt to change in Conan recipe for NuDB #4615

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b16931b
Adapt to new Conan recipe for NuDB
thejohnfreeman Jul 10, 2023
460598b
Work around both recipe revisions
thejohnfreeman Jul 10, 2023
6ac05dd
FATAL -> FATAL_ERROR
thejohnfreeman Jul 10, 2023
dfc62af
elif -> elseif
thejohnfreeman Jul 10, 2023
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
11 changes: 10 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down