From 0035ba2b3ee933c7719014bdc5a498eeece7ad9a Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Wed, 11 Dec 2024 09:23:33 -0500 Subject: [PATCH] Correct style issues found by CI --- docs/packages/patches_inline.json | 2 ++ rapids-cmake/cpm/detail/convert_patch_json.cmake | 5 +++-- rapids-cmake/cpm/detail/load_preset_versions.cmake | 2 +- rapids-cmake/cpm/detail/pinning_write_file.cmake | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/packages/patches_inline.json b/docs/packages/patches_inline.json index 412fd7cb..ca703fed 100644 --- a/docs/packages/patches_inline.json +++ b/docs/packages/patches_inline.json @@ -28,4 +28,6 @@ }, "issue": "Example of an inline patch", "fixed_in": "" + } + ] } diff --git a/rapids-cmake/cpm/detail/convert_patch_json.cmake b/rapids-cmake/cpm/detail/convert_patch_json.cmake index 4df58b27..02cd8eac 100644 --- a/rapids-cmake/cpm/detail/convert_patch_json.cmake +++ b/rapids-cmake/cpm/detail/convert_patch_json.cmake @@ -51,9 +51,10 @@ function(rapids_cpm_convert_patch_json) # Figure out the file path set(file - "${CMAKE_BINARY_DIR}/rapids-cmake/patches/${_RAPIDS_PACKAGE_NAME}/embedded_patch_${_RAPIDS_INDEX}.${type}") + "${CMAKE_BINARY_DIR}/rapids-cmake/patches/${_RAPIDS_PACKAGE_NAME}/embedded_patch_${_RAPIDS_INDEX}.${type}" + ) - # Transfrom from a list of strings to a single file + # Transform from a list of strings to a single file string(JSON content_length LENGTH "${json_content}") math(EXPR content_length "${content_length} - 1") unset(file_content) diff --git a/rapids-cmake/cpm/detail/load_preset_versions.cmake b/rapids-cmake/cpm/detail/load_preset_versions.cmake index 1b18ee83..5b7edcc9 100644 --- a/rapids-cmake/cpm/detail/load_preset_versions.cmake +++ b/rapids-cmake/cpm/detail/load_preset_versions.cmake @@ -86,7 +86,7 @@ function(rapids_cpm_load_preset_versions) else() set_property(GLOBAL PROPERTY rapids_cpm_${normalized_pkg_name}_json "${data}") set_property(GLOBAL PROPERTY rapids_cpm_${normalized_pkg_name}_json_file - "${_rapids_preset_version_file}") + "${_rapids_preset_version_file}") set_property(GLOBAL PROPERTY rapids_cpm_${normalized_pkg_name}_proper_name "${package_name}") endif() endforeach() diff --git a/rapids-cmake/cpm/detail/pinning_write_file.cmake b/rapids-cmake/cpm/detail/pinning_write_file.cmake index 80cd2a8f..c7d67a9b 100644 --- a/rapids-cmake/cpm/detail/pinning_write_file.cmake +++ b/rapids-cmake/cpm/detail/pinning_write_file.cmake @@ -112,7 +112,7 @@ function(rapids_cpm_pinning_transform_patches package_name patches_array_var out include("${rapids-cmake-dir}/cpm/detail/convert_patch_json.cmake") - # We are p need to get the `files` key and tranform it + # We need to get the `files` key and transform it set(json_data "${${patches_array_var}}") string(JSON patch_count LENGTH "${json_data}") if(patch_count GREATER_EQUAL 1)