From 825e923081337b94f2c5b9fdc12e08b92a387aa6 Mon Sep 17 00:00:00 2001 From: Denis Angell Date: Fri, 20 Feb 2026 04:24:28 +0900 Subject: [PATCH] fix cmake & xrpl_core --- cmake/deps/Protobuf.cmake | 8 ++++---- cmake/deps/gRPC.cmake | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmake/deps/Protobuf.cmake b/cmake/deps/Protobuf.cmake index e5d866cb0..b70f31977 100644 --- a/cmake/deps/Protobuf.cmake +++ b/cmake/deps/Protobuf.cmake @@ -7,18 +7,18 @@ set(CMAKE_CURRENT_BINARY_DIR ${output_dir}) protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS src/ripple/proto/ripple.proto) set(CMAKE_CURRENT_BINARY_DIR ${ccbd}) -target_include_directories(xrpl_core SYSTEM PUBLIC +target_include_directories(xrpl.libpb SYSTEM PUBLIC # The generated implementation imports the header relative to the output # directory. $ $ ) -target_sources(xrpl_core PRIVATE ${output_dir}/src/ripple/proto/ripple.pb.cc) +target_sources(xrpl.libpb PRIVATE ${output_dir}/src/ripple/proto/ripple.pb.cc) install( FILES ${output_dir}/src/ripple/proto/ripple.pb.h DESTINATION include/ripple/proto) -target_link_libraries(xrpl_core PUBLIC protobuf::libprotobuf) -target_compile_options(xrpl_core +target_link_libraries(xrpl.libpb PUBLIC protobuf::libprotobuf) +target_compile_options(xrpl.libpb PUBLIC $<$: --system-header-prefix="google/protobuf" diff --git a/cmake/deps/gRPC.cmake b/cmake/deps/gRPC.cmake index de3a88b7b..3be1e1733 100644 --- a/cmake/deps/gRPC.cmake +++ b/cmake/deps/gRPC.cmake @@ -53,24 +53,24 @@ foreach(file ${GRPC_DEFINITION_FILES}) list(APPEND GRPC_PROTO_HDRS ${hdr_1} ${hdr_2}) endforeach() -target_include_directories(xrpl_core SYSTEM PUBLIC +target_include_directories(xrpl.libpb SYSTEM PUBLIC $ $ # The generated sources include headers relative to this path. Fix it later. $ ) -target_sources(xrpl_core PRIVATE ${GRPC_PROTO_SRCS}) +target_sources(xrpl.libpb PRIVATE ${GRPC_PROTO_SRCS}) install( DIRECTORY ${output_dir}/ripple DESTINATION include/ FILES_MATCHING PATTERN "*.h" ) -target_link_libraries(xrpl_core PUBLIC +target_link_libraries(xrpl.libpb PUBLIC "gRPC::grpc++" # libgrpc is missing references. absl::random_random ) -target_compile_options(xrpl_core +target_compile_options(xrpl.libpb PRIVATE $<$:-wd4065> $<$>:-Wno-deprecated-declarations>