File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -3830,15 +3830,6 @@ function(build_orc)
38303830
38313831 fetchcontent_makeavailable (orc)
38323832
3833- # ORC 2.2.1 unconditionally adds /std:c++17 on MSVC via
3834- # add_compile_options, which overrides CMAKE_CXX_STANDARD and causes
3835- # ABI mismatches with protobuf (GlobalEmptyStringConstexpr vs
3836- # GlobalEmptyStringDynamicInit). Override the standard on the orc target.
3837- # Fixed in ORC 2.3.0: https://github.com/apache/orc/commit/7674f43
3838- if (MSVC )
3839- target_compile_options (orc PRIVATE "/std:c++${CMAKE_CXX_STANDARD } " )
3840- endif ()
3841-
38423833 add_library (orc::orc INTERFACE IMPORTED )
38433834 target_link_libraries (orc::orc INTERFACE orc )
38443835 target_link_libraries (orc::orc INTERFACE ${ARROW_PROTOBUF_LIBPROTOBUF} )
Original file line number Diff line number Diff line change @@ -88,8 +88,8 @@ ARROW_OPENTELEMETRY_BUILD_VERSION=v1.21.0
8888ARROW_OPENTELEMETRY_BUILD_SHA256_CHECKSUM=98e5546f577a11b52a57faed1f4cc60d8c1daa44760eba393f43eab5a8ec46a2
8989ARROW_OPENTELEMETRY_PROTO_BUILD_VERSION=v1.7.0
9090ARROW_OPENTELEMETRY_PROTO_BUILD_SHA256_CHECKSUM=11330d850f5e24d34c4246bc8cb21fcd311e7565d219195713455a576bb11bed
91- ARROW_ORC_BUILD_VERSION=2.2.1
92- ARROW_ORC_BUILD_SHA256_CHECKSUM=52fc762332442e8b05d7182f8c035f9e04d945b9a52be22ab69f28b3f37d4500
91+ ARROW_ORC_BUILD_VERSION=2.3.0
92+ ARROW_ORC_BUILD_SHA256_CHECKSUM=6c9e2f6663ac9ef34ca4ae5ae4f004a651e5fe31f2e05b6eb5d99d105091d87c
9393ARROW_PROTOBUF_BUILD_VERSION=v31.1
9494ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=12bfd76d27b9ac3d65c00966901609e020481b9474ef75c7ff4601ac06fa0b82
9595# Because of https://github.com/Tencent/rapidjson/pull/1323, we require
You can’t perform that action at this time.
0 commit comments