Skip to content

Commit

Permalink
apacheGH-41755: [C++][ORC] Ensure setting detected ORC version (apach…
Browse files Browse the repository at this point in the history
…e#41767)

`FindorcAlt.cmake` doesn't set `orcAlt_VERSION` when it finds ORC by `find_library()`/`find_path()`. If `orcAlt_VERSION` isn't set, ORC version detection by caller is failed.

`cpp/src/arrow/adapters/orc/adapter.cc` uses detected ORC version. If detected ORC version isn't correct, needless time zone database check is used.

Deployed in conda-forge through conda-forge/arrow-cpp-feedstock#1424 and confirmed as working in conda-forge/pyarrow-feedstock#122
* GitHub Issue: apache#41755

Authored-by: H. Vetinari <[email protected]>
Signed-off-by: Sutou Kouhei <[email protected]>
  • Loading branch information
h-vetinari authored May 27, 2024
1 parent 1c9e393 commit ff9921f
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions cpp/cmake_modules/FindorcAlt.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,5 @@ if(orcAlt_FOUND)
PROPERTIES IMPORTED_LOCATION "${ORC_STATIC_LIB}"
INTERFACE_INCLUDE_DIRECTORIES "${ORC_INCLUDE_DIR}")
endif()
set(orcAlt_VERSION ${ORC_VERSION})
endif()

0 comments on commit ff9921f

Please sign in to comment.