diff --git a/cmake/thirdparty/get_spdlog.cmake b/cmake/thirdparty/get_spdlog.cmake index 296370469..66065b485 100644 --- a/cmake/thirdparty/get_spdlog.cmake +++ b/cmake/thirdparty/get_spdlog.cmake @@ -16,19 +16,10 @@ function(find_and_configure_spdlog) include(${rapids-cmake-dir}/cpm/spdlog.cmake) - rapids_cpm_spdlog(FMT_OPTION "EXTERNAL_FMT_HO" INSTALL_EXPORT_SET rmm-exports) - rapids_export_package(BUILD spdlog rmm-exports) - - if(spdlog_ADDED) - rapids_export( - BUILD spdlog - EXPORT_SET spdlog - GLOBAL_TARGETS spdlog spdlog_header_only - NAMESPACE spdlog::) - include("${rapids-cmake-dir}/export/find_package_root.cmake") - rapids_export_find_package_root(BUILD spdlog [=[${CMAKE_CURRENT_LIST_DIR}]=] - EXPORT_SET rmm-exports) - endif() + rapids_cpm_spdlog( + FMT_OPTION "EXTERNAL_FMT_HO" + INSTALL_EXPORT_SET rmm-exports + BUILD_EXPORT_SET rmm-exports) endfunction() find_and_configure_spdlog() diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index c4bbcccd2..633db3b2c 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -16,7 +16,7 @@ dependencies: - cxx-compiler - cython>=3.0.0 - doxygen=1.9.1 -- fmt>=10.1.1,<11 +- fmt>=10.2.1,<11 - gcc_linux-64=11.* - gcovr>=5.0 - graphviz @@ -34,7 +34,7 @@ dependencies: - pytest-cov - python>=3.9,<3.12 - scikit-build-core>=0.7.0 -- spdlog>=1.12.0,<1.13 +- spdlog>=1.13.0,<1.14 - sphinx - sphinx-copybutton - sphinx-markdown-tables diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml index 63876715a..76ad09a85 100644 --- a/conda/environments/all_cuda-122_arch-x86_64.yaml +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -15,7 +15,7 @@ dependencies: - cxx-compiler - cython>=3.0.0 - doxygen=1.9.1 -- fmt>=10.1.1,<11 +- fmt>=10.2.1,<11 - gcc_linux-64=11.* - gcovr>=5.0 - graphviz @@ -32,7 +32,7 @@ dependencies: - pytest-cov - python>=3.9,<3.12 - scikit-build-core>=0.7.0 -- spdlog>=1.12.0,<1.13 +- spdlog>=1.13.0,<1.14 - sphinx - sphinx-copybutton - sphinx-markdown-tables diff --git a/conda/recipes/librmm/conda_build_config.yaml b/conda/recipes/librmm/conda_build_config.yaml index e44698952..c1913f694 100644 --- a/conda/recipes/librmm/conda_build_config.yaml +++ b/conda/recipes/librmm/conda_build_config.yaml @@ -14,10 +14,10 @@ cmake_version: - ">=3.26.4" fmt_version: - - ">=10.1.1,<11" + - ">=10.2.1,<11" spdlog_version: - - ">=1.12.0,<1.13" + - ">=1.13.0,<1.14" sysroot_version: - "2.17" diff --git a/dependencies.yaml b/dependencies.yaml index 10d0eab2d..45e35a29d 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -75,9 +75,9 @@ dependencies: packages: - c-compiler - cxx-compiler - - fmt>=10.1.1,<11 + - fmt>=10.2.1,<11 - scikit-build-core>=0.7.0 - - spdlog>=1.12.0,<1.13 + - spdlog>=1.13.0,<1.14 - output_types: [requirements, pyproject] packages: - scikit-build-core[pyproject]>=0.7.0 diff --git a/rapids_config.cmake b/rapids_config.cmake index 84c20c01e..b4aa39fc8 100644 --- a/rapids_config.cmake +++ b/rapids_config.cmake @@ -26,6 +26,11 @@ else() endif() if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/RMM_RAPIDS-${RAPIDS_VERSION_MAJOR_MINOR}.cmake") + include(FetchContent) + FetchContent_Declare( + rapids-cmake + GIT_REPOSITORY https://github.com/jameslamb/rapids-cmake.git + GIT_TAG fmt-version) file( DOWNLOAD "https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-${RAPIDS_VERSION_MAJOR_MINOR}/RAPIDS.cmake"