diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index a5b79f82287..a635e655c39 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -784,11 +784,9 @@ if(CUDF_BUILD_BENCHMARKS) include(${rapids-cmake-dir}/cpm/gbench.cmake) rapids_cpm_gbench() - # Find or install NVBench Temporarily force downloading of fmt because current versions of nvbench - # do not support the latest version of fmt, which is automatically pulled into our conda - # environments by mamba. - set(CPM_DOWNLOAD_fmt TRUE) + # Find or install nvbench include(cmake/thirdparty/get_nvbench.cmake) + add_subdirectory(benchmarks) endif() diff --git a/cpp/cmake/thirdparty/get_nvbench.cmake b/cpp/cmake/thirdparty/get_nvbench.cmake index f0642145fa0..3a39e6c7ad1 100644 --- a/cpp/cmake/thirdparty/get_nvbench.cmake +++ b/cpp/cmake/thirdparty/get_nvbench.cmake @@ -18,6 +18,11 @@ function(find_and_configure_nvbench) include(${rapids-cmake-dir}/cpm/nvbench.cmake) include(${rapids-cmake-dir}/cpm/package_override.cmake) + # Find or install NVBench Temporarily force downloading of fmt because current versions of nvbench + # do not support the latest version of fmt, which is automatically pulled into our conda + # environments by mamba. + set(CPM_DOWNLOAD_fmt TRUE) + set(cudf_patch_dir "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/patches") rapids_cpm_package_override("${cudf_patch_dir}/nvbench_override.json") diff --git a/cpp/cmake/thirdparty/patches/nvbench_override.json b/cpp/cmake/thirdparty/patches/nvbench_override.json index 3a62c13c962..ad9b19c29c1 100644 --- a/cpp/cmake/thirdparty/patches/nvbench_override.json +++ b/cpp/cmake/thirdparty/patches/nvbench_override.json @@ -1,7 +1,7 @@ { "packages" : { - "Thrust" : { + "nvbench" : { "patches" : [ { "file" : "${current_json_dir}/nvbench_global_setup.diff",