Skip to content

Commit 4f1cac1

Browse files
authored
GH-48725: [C++] Fix bundled Protobuf doesn't exist in libarrow_bundled_dependencies (#48726)
### Rationale for this change We need to update `ARROW_BUNDLED_STATIC_LIBS` in the parent scope because GH-48183 changed to `function(build_protobuf)` from `macro(build_protobuf)`. ### What changes are included in this PR? Update `ARROW_BUNDLED_STATIC_LIBS` in the parent scope. ### Are these changes tested? Yes. ### Are there any user-facing changes? Yes. * GitHub Issue: #48725 Authored-by: Sutou Kouhei <kou@clear-code.com> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
1 parent 35717a7 commit 4f1cac1

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

cpp/cmake_modules/ThirdpartyToolchain.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1974,7 +1974,9 @@ function(build_protobuf)
19741974

19751975
# Make protobuf_fc depend on the install completion marker
19761976
add_custom_target(protobuf_fc DEPENDS "${PROTOBUF_PREFIX}/.protobuf_installed")
1977-
list(APPEND ARROW_BUNDLED_STATIC_LIBS protobuf::libprotobuf)
1977+
set(ARROW_BUNDLED_STATIC_LIBS
1978+
${ARROW_BUNDLED_STATIC_LIBS} protobuf::libprotobuf
1979+
PARENT_SCOPE)
19781980

19791981
if(CMAKE_CROSSCOMPILING)
19801982
# If we are cross compiling, we need to build protoc for the host

0 commit comments

Comments
 (0)