Skip to content

Commit 8903ac8

Browse files
committed
inject dependencies for orc
1 parent 91a42dc commit 8903ac8

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

cpp/cmake_modules/ThirdpartyToolchain.cmake

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5278,6 +5278,13 @@ function(build_orc)
52785278
get_target_property(ORC_ZLIB_ROOT ZLIB::ZLIB INTERFACE_INCLUDE_DIRECTORIES)
52795279
get_filename_component(ORC_ZLIB_ROOT "${ORC_ZLIB_ROOT}" DIRECTORY)
52805280

5281+
set(ORC_CMAKE_PREFIX)
5282+
set(ORC_CMAKE_PREFIX "${ORC_CMAKE_PREFIX};${ABSL_PREFIX}")
5283+
set(ORC_CMAKE_PREFIX "${ORC_CMAKE_PREFIX};${PROTOBUF_PREFIX}")
5284+
5285+
string(REPLACE ";" ${EP_LIST_SEPARATOR} ORC_CMAKE_PREFIX_ALT_SEP
5286+
"${ORC_CMAKE_PREFIX}")
5287+
52815288
set(ORC_CMAKE_ARGS
52825289
${EP_COMMON_CMAKE_ARGS}
52835290
"-DCMAKE_INSTALL_PREFIX=${ORC_PREFIX}"
@@ -5287,6 +5294,7 @@ function(build_orc)
52875294
-DBUILD_TOOLS=OFF
52885295
-DBUILD_CPP_TESTS=OFF
52895296
-DINSTALL_VENDORED_LIBS=OFF
5297+
-DCMAKE_PREFIX_PATH='${ORC_CMAKE_PREFIX_ALT_SEP}'
52905298
"-DPROTOBUF_EXECUTABLE=$<TARGET_FILE:${ARROW_PROTOBUF_PROTOC}>"
52915299
"-DPROTOBUF_HOME=${ORC_PROTOBUF_ROOT}"
52925300
"-DPROTOBUF_INCLUDE_DIR=$<TARGET_PROPERTY:${ARROW_PROTOBUF_LIBPROTOBUF},INTERFACE_INCLUDE_DIRECTORIES>"
@@ -5453,7 +5461,6 @@ macro(build_opentelemetry)
54535461
list(APPEND OPENTELEMETRY_PREFIX_PATH_LIST ${ABSL_PREFIX})
54545462
list(APPEND OPENTELEMETRY_PREFIX_PATH_LIST ${PROTOBUF_PREFIX})
54555463

5456-
54575464
get_target_property(OPENTELEMETRY_PROTOBUF_INCLUDE_DIR ${ARROW_PROTOBUF_LIBPROTOBUF}
54585465
INTERFACE_INCLUDE_DIRECTORIES)
54595466
get_target_property(OPENTELEMETRY_PROTOBUF_LIBRARY ${ARROW_PROTOBUF_LIBPROTOBUF}

0 commit comments

Comments
 (0)