This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 13a9ad988e GH-34163: [C++][CI] Ensure using the same Zstandard with
bundled ORC (#34164)
13a9ad988e is described below
commit 13a9ad988e908846aca960515d9ca855c3328e7c
Author: NoahFournier <[email protected]>
AuthorDate: Wed Feb 15 11:14:55 2023 +0000
GH-34163: [C++][CI] Ensure using the same Zstandard with bundled ORC
(#34164)
This change fixes a variable name and specifies more Zstandard related
parameters explicitly to use the same Zstandard used in Apache Arrow itself.
* Closes: #34163
Lead-authored-by: NoahFournier
<[email protected]>
Co-authored-by: Sutou Kouhei <[email protected]>
Signed-off-by: Sutou Kouhei <[email protected]>
---
cpp/cmake_modules/ThirdpartyToolchain.cmake | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake
b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 6e665a1e19..875c866822 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -4446,7 +4446,9 @@ macro(build_orc)
"-DPROTOBUF_LIBRARY=${ORC_PROTOBUF_LIBRARY}"
"-DPROTOC_LIBRARY=${ORC_PROTOBUF_LIBRARY}"
"-DLZ4_HOME=${ORC_LZ4_ROOT}"
- "-DZSTD_HOME=${ORZ_ZSTD_ROOT}")
+ "-DZSTD_HOME=${ORC_ZSTD_ROOT}"
+
"-DZSTD_INCLUDE_DIR=$<TARGET_PROPERTY:${ARROW_ZSTD_LIBZSTD},INTERFACE_INCLUDE_DIRECTORIES>"
+ "-DZSTD_LIBRARY=$<TARGET_FILE:${ARROW_ZSTD_LIBZSTD}>")
if(ORC_PROTOBUF_EXECUTABLE)
set(ORC_CMAKE_ARGS ${ORC_CMAKE_ARGS}
"-DPROTOBUF_EXECUTABLE:FILEPATH=${ORC_PROTOBUF_EXECUTABLE}")
