From 18d0f7bca7d6cf23277fcee0268d32ab8e57fffe Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Wed, 21 Aug 2024 16:54:33 -0400 Subject: [PATCH] Use faster to clone repos in cpm_find-patch-command --- .../cpm/cpm_find-patch-command/CMakeLists.txt | 26 +++++++++---------- .../cpm/cpm_find-patch-command/override.json | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/testing/cpm/cpm_find-patch-command/CMakeLists.txt b/testing/cpm/cpm_find-patch-command/CMakeLists.txt index 041641a4..da809d29 100644 --- a/testing/cpm/cpm_find-patch-command/CMakeLists.txt +++ b/testing/cpm/cpm_find-patch-command/CMakeLists.txt @@ -17,9 +17,9 @@ cmake_minimum_required(VERSION 3.26.4) project(rapids-cpm_find-patch-command-project LANGUAGES CXX) include("${rapids-cmake-dir}/cpm/detail/package_details.cmake") -rapids_cpm_package_details(CCCL version repository tag shallow exclude) +rapids_cpm_package_details(fmt version repository tag shallow exclude) -set(deps_dir "${CMAKE_CURRENT_BINARY_DIR}/_cccl_dep") +set(deps_dir "${CMAKE_CURRENT_BINARY_DIR}/_fmt_dep") if(NOT EXISTS "${deps_dir}") file(MAKE_DIRECTORY "${deps_dir}") find_package(Git) @@ -28,8 +28,8 @@ if(NOT EXISTS "${deps_dir}") WORKING_DIRECTORY "${deps_dir}") endif() -set(cccl_dir "${deps_dir}/cccl") -list(APPEND CMAKE_PREFIX_PATH "${cccl_dir}") +set(fmt_dir "${deps_dir}/fmt") +list(APPEND CMAKE_PREFIX_PATH "${fmt_dir}") include(${rapids-cmake-dir}/cpm/init.cmake) rapids_cpm_init() @@ -37,28 +37,28 @@ rapids_cpm_init() include(${rapids-cmake-dir}/cpm/package_override.cmake) rapids_cpm_package_override(${CMAKE_CURRENT_SOURCE_DIR}/override.json) -include(${rapids-cmake-dir}/cpm/cccl.cmake) -rapids_cpm_cccl() +include(${rapids-cmake-dir}/cpm/fmt.cmake) +rapids_cpm_fmt() -if(NOT "${CCCL_ADDED}") +if(NOT "${fmt_ADDED}") message(FATAL_ERROR "The found repo was used rather than downloading and patching a new version") endif() # Verify that the two files that we inserted into the CCCL source tree exist # Which proves the patches in the override are properly applied -if(NOT EXISTS "${CCCL_SOURCE_DIR}/git_file_1.txt") - message(FATAL_ERROR "failed to apply CCCL first patch") +if(NOT EXISTS "${fmt_SOURCE_DIR}/git_file_1.txt") + message(FATAL_ERROR "failed to apply fmt first patch") endif() -if(NOT EXISTS "${CCCL_SOURCE_DIR}/git_file_2.txt") - message(FATAL_ERROR "failed to apply CCCL second patch") +if(NOT EXISTS "${fmt_SOURCE_DIR}/git_file_2.txt") + message(FATAL_ERROR "failed to apply fmt second patch") endif() execute_process( COMMAND ${GIT_EXECUTABLE} diff --quiet ${tag} RESULT_VARIABLE REPO_IS_PATCHED - WORKING_DIRECTORY "${CCCL_SOURCE_DIR}") + WORKING_DIRECTORY "${fmt_SOURCE_DIR}") if(NOT ${REPO_IS_PATCHED}) - message(FATAL_ERROR "The repo was downloaded to ${CCCL_SOURCE_DIR} but not patched.") + message(FATAL_ERROR "The repo was downloaded to ${fmt_SOURCE_DIR} but not patched.") endif() diff --git a/testing/cpm/cpm_find-patch-command/override.json b/testing/cpm/cpm_find-patch-command/override.json index fa73f144..8fc259d8 100644 --- a/testing/cpm/cpm_find-patch-command/override.json +++ b/testing/cpm/cpm_find-patch-command/override.json @@ -1,6 +1,6 @@ { "packages": { - "CCCL": { + "fmt": { "patches": [ { "file": "${current_json_dir}/patches/0001-move-git-sha1.patch",