File tree Expand file tree Collapse file tree 2 files changed +19
-1
lines changed Expand file tree Collapse file tree 2 files changed +19
-1
lines changed Original file line number Diff line number Diff line change @@ -43,6 +43,9 @@ if [ ! -z "${CONDA_PREFIX}" ] && [ "${ARROW_EMSCRIPTEN:-OFF}" = "OFF" ]; then
43
43
fi
44
44
export ARROW_CMAKE_ARGS
45
45
export ARROW_GANDIVA_PC_CXX_FLAGS=$( echo | ${CXX} -E -Wp,-v -xc++ - 2>&1 | grep ' ^ ' | awk ' {print "-isystem;" substr($1, 1)}' | tr ' \n' ' ;' )
46
+
47
+ export LIBRARY_PATH=" ${CONDA_PREFIX} /lib"
48
+ export CPLUS_INCLUDE_PATH=" ${CONDA_PREFIX} /include"
46
49
elif [ -x " $( command -v xcrun) " ]; then
47
50
export ARROW_GANDIVA_PC_CXX_FLAGS=" -isysroot;$( xcrun --show-sdk-path) "
48
51
fi
Original file line number Diff line number Diff line change @@ -473,7 +473,22 @@ if needs_json
473
473
endif
474
474
475
475
if needs_orc
476
- orc_dep = dependency (' orc' )
476
+ # not all versions of orc installed via conda distribute
477
+ # cmake/pkgconfig information, so they are undetectable
478
+ # without custom logic
479
+ orc_headers = [' orc/orc-config.hh' ]
480
+ orc_lib = cpp_compiler.find_library (
481
+ ' orc' ,
482
+ has_headers : orc_headers,
483
+ required : false ,
484
+ )
485
+
486
+ if orc_lib.found()
487
+ orc_dep = declare_dependency (dependencies : orc_lib)
488
+ else
489
+ orc_dep = dependency (' orc' )
490
+ endif
491
+
477
492
arrow_components += {
478
493
' arrow_orc' : {
479
494
' sources' : files (
You can’t perform that action at this time.
0 commit comments