diff --git a/dev/benchmarks/CMakeLists.txt b/dev/benchmarks/CMakeLists.txt index bb452c176..5546e876f 100644 --- a/dev/benchmarks/CMakeLists.txt +++ b/dev/benchmarks/CMakeLists.txt @@ -53,13 +53,11 @@ fetchcontent_declare(benchmark fetchcontent_makeavailable(benchmark) if(IS_DIRECTORY "${NANOARROW_BENCHMARK_SOURCE_URL}") + # In nanoarrow >= 0.6.0, optional features use NANOARROW_XXX=ON instead + # of being packaged as separate projects. + set(NANOARROW_IPC ON CACHE INTERNAL "") fetchcontent_declare(nanoarrow SOURCE_DIR "${NANOARROW_BENCHMARK_SOURCE_URL}") - fetchcontent_declare(nanoarrow_ipc - SOURCE_DIR - "${NANOARROW_BENCHMARK_SOURCE_URL}/extensions/nanoarrow_ipc") - fetchcontent_makeavailable(nanoarrow) - fetchcontent_makeavailable(nanoarrow_ipc) elseif(NOT "${NANOARROW_BENCHMARK_SOURCE_URL}" STREQUAL "") fetchcontent_declare(nanoarrow URL "${NANOARROW_BENCHMARK_SOURCE_URL}") fetchcontent_declare(nanoarrow_ipc URL "${NANOARROW_BENCHMARK_SOURCE_URL}" diff --git a/dev/benchmarks/CMakePresets.json b/dev/benchmarks/CMakePresets.json index d64be290e..60ca1cc52 100644 --- a/dev/benchmarks/CMakePresets.json +++ b/dev/benchmarks/CMakePresets.json @@ -25,6 +25,17 @@ "NANOARROW_BENCHMARK_SOURCE_URL": "${sourceDir}/../.." } }, + { + "name": "v0.5.0", + "displayName": "v0.5.0", + "description": "Uses the nanoarrow C sources the 0.5.0 release.", + "inherits": [ + "base" + ], + "cacheVariables": { + "NANOARROW_BENCHMARK_SOURCE_URL": "https://github.com/apache/arrow-nanoarrow/archive/refs/tags/apache-arrow-nanoarrow-0.5.0.zip" + } + }, { "name": "v0.4.0", "displayName": "v0.4.0",