Skip to content

[CELEBORN-2266] Modernize Protobuf CMake usage and add install rules #3602

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

Closed
jaystarshot wants to merge 2 commits into from
+27 −2
Closed

[CELEBORN-2266] Modernize Protobuf CMake usage and add install rules #3602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c19029
[CPP] Modernize Protobuf CMake usage and add install rules
jaystarshot Feb 15, 2026
a8415c9
fix ci proto
jaystarshot Feb 15, 2026
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
26 changes: 25 additions & 1 deletion cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ set(ProtoGenSource "${CMAKE_BINARY_DIR}/celeborn/proto/TransportMessagesCpp.pb.c
add_custom_command(
OUTPUT ${ProtoGenSource} ${ProtoGenHeader}
COMMAND mkdir -p ${CMAKE_BINARY_DIR}/celeborn/proto
COMMAND protoc --proto_path=${CMAKE_CURRENT_SOURCE_DIR}/celeborn/proto --cpp_out=${CMAKE_BINARY_DIR}/celeborn/proto ${ProtoFile}
COMMAND protobuf::protoc --proto_path=${CMAKE_CURRENT_SOURCE_DIR}/celeborn/proto --cpp_out=${CMAKE_BINARY_DIR}/celeborn/proto ${ProtoFile}
DEPENDS ${ProtoFile}
VERBATIM)
add_custom_target(
Expand All @@ -175,3 +175,27 @@ if(CELEBORN_BUILD_TESTS)
endif()

add_subdirectory(celeborn)

# ---------------------------------------------------------------------------
# Install rules — headers + static libraries
# ---------------------------------------------------------------------------
# Install all public headers preserving directory structure.
install(
DIRECTORY celeborn/
DESTINATION include/celeborn
FILES_MATCHING PATTERN "*.h"
PATTERN "tests" EXCLUDE
)

# Install the generated proto header.
install(
FILES ${ProtoGenHeader}
DESTINATION include/celeborn/proto
)

# Install static libraries.
install(
TARGETS client conf memory network proto protocol utils
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
)
2 changes: 1 addition & 1 deletion cpp/celeborn/proto/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
# limitations under the License.
add_library(proto STATIC ${ProtoGenSource} ${ProtoGenHeader})
add_dependencies(proto generate_proto_source)
target_link_libraries(proto ${Boost_LIBRARIES} ${PROTOBUF_LIBRARY})
target_link_libraries(proto ${Boost_LIBRARIES} protobuf::libprotobuf)
1 change: 1 addition & 0 deletions cpp/celeborn/utils/CelebornUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <google/protobuf/io/coded_stream.h>
#include <charconv>
#include <chrono>
#include <set>
Copy link

@afterincomparableyum afterincomparableyum Feb 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch on the transitive dependency 👍

#include <vector>

#include "celeborn/memory/ByteBuffer.h"
Expand Down
Loading