File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -4646,6 +4646,9 @@ function(build_orc)
46464646 set (ZLIB_HOME
46474647 ${ZLIB_ROOT}
46484648 CACHE STRING "" FORCE )
4649+ # From CMake 3.21 onwards the set(CACHE) command does not remove any normal
4650+ # variable of the same name from the current scope. We have to manually remove
4651+ # the variable via unset to avoid ORC not finding the ZLIB_LIBRARY.
46494652 unset (ZLIB_LIBRARY)
46504653 set (ZLIB_LIBRARY
46514654 ZLIB::ZLIB
@@ -4680,6 +4683,7 @@ function(build_orc)
46804683 set (STOP_BUILD_ON_WARNING
46814684 OFF
46824685 CACHE BOOL "" FORCE )
4686+
46834687 fetchcontent_makeavailable (orc)
46844688
46854689 add_library (orc::orc INTERFACE IMPORTED )
Original file line number Diff line number Diff line change @@ -1591,11 +1591,11 @@ services:
15911591 - ${REPO}:r-${R_ORG}-${R_IMAGE}-${R_TAG}
15921592 args :
15931593 base : ${R_ORG}/${R_IMAGE}:${R_TAG}
1594+ cmake : ${CMAKE}
15941595 r_dev : ${ARROW_R_DEV}
15951596 tz : ${TZ}
15961597 r_prune_deps : ${R_PRUNE_DEPS}
15971598 r_custom_ccache : ${R_CUSTOM_CCACHE}
1598- cmake : ${CMAKE}
15991599 shm_size : *shm-size
16001600 environment :
16011601 << : [*common, *sccache]
@@ -2045,9 +2045,9 @@ services:
20452045 cache_from :
20462046 - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-verify-rc
20472047 args :
2048- repo : ${REPO}
20492048 arch : ${ARCH}
20502049 cmake : ${CMAKE}
2050+ repo : ${REPO}
20512051 volumes :
20522052 - .:/arrow:delegated
20532053 - ${DOCKER_VOLUME_PREFIX}ubuntu-ccache:/ccache:delegated
You can’t perform that action at this time.
0 commit comments