Try to avoid ORC hardcoding CXX 17 and failing with our built protobuf when linking v2

Author: raulcd

cpp/cmake_modules/ThirdpartyToolchain.cmake

@@ -3638,12 +3638,6 @@ function(build_orc)
 
     set(CMAKE_UNITY_BUILD FALSE)
 
-    # ORC's CMakeLists.txt unconditionally adds /std:c++17 on MSVC via
-    # add_compile_options, which overrides CMAKE_CXX_STANDARD and causes
-    # ABI mismatches with protobuf. Prevent this by pre-setting the check
-    # result so the flag is not added.
-    set(CPP17_FLAG_SUPPORTED OFF)
-
     set(ORC_PREFER_STATIC_LZ4 OFF)
     set(LZ4_HOME "${ORC_LZ4_ROOT}")
     set(LZ4_INCLUDE_DIR "${ORC_LZ4_INCLUDE_DIR}")
@@ -3693,6 +3687,15 @@ function(build_orc)
 
     fetchcontent_makeavailable(orc)
 
+    # ORC 2.2.1 unconditionally adds /std:c++17 on MSVC via
+    # add_compile_options, which overrides CMAKE_CXX_STANDARD and causes
+    # ABI mismatches with protobuf (GlobalEmptyStringConstexpr vs
+    # GlobalEmptyStringDynamicInit). Override the standard on the orc target.
+    # Fixed in ORC 2.3.0: https://github.com/apache/orc/commit/7674f43
+    if(MSVC)
+      target_compile_options(orc PRIVATE "/std:c++${CMAKE_CXX_STANDARD}")
+    endif()
+
     add_library(orc::orc INTERFACE IMPORTED)
     target_link_libraries(orc::orc INTERFACE orc)
     target_link_libraries(orc::orc INTERFACE ${ARROW_PROTOBUF_LIBPROTOBUF})