From 3b32d6f3075c18666d84447f5c207c70307fb8fe Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Thu, 24 Oct 2024 12:32:50 -0400 Subject: [PATCH] Correct style issues found by CI --- rapids-cmake/cpm/detail/get_default_json.cmake | 2 +- rapids-cmake/cpm/detail/get_override_json.cmake | 2 +- rapids-cmake/cpm/detail/load_preset_versions.cmake | 4 ++-- rapids-cmake/cpm/package_override.cmake | 13 ++++++++----- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/rapids-cmake/cpm/detail/get_default_json.cmake b/rapids-cmake/cpm/detail/get_default_json.cmake index 54dfeb60..a43f4074 100644 --- a/rapids-cmake/cpm/detail/get_default_json.cmake +++ b/rapids-cmake/cpm/detail/get_default_json.cmake @@ -1,5 +1,5 @@ #============================================================================= -# Copyright (c) 2021, NVIDIA CORPORATION. +# Copyright (c) 2021-2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rapids-cmake/cpm/detail/get_override_json.cmake b/rapids-cmake/cpm/detail/get_override_json.cmake index c193c221..9e01770c 100644 --- a/rapids-cmake/cpm/detail/get_override_json.cmake +++ b/rapids-cmake/cpm/detail/get_override_json.cmake @@ -1,5 +1,5 @@ #============================================================================= -# Copyright (c) 2021, NVIDIA CORPORATION. +# Copyright (c) 2021-2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rapids-cmake/cpm/detail/load_preset_versions.cmake b/rapids-cmake/cpm/detail/load_preset_versions.cmake index 6ead9343..17355f53 100644 --- a/rapids-cmake/cpm/detail/load_preset_versions.cmake +++ b/rapids-cmake/cpm/detail/load_preset_versions.cmake @@ -75,8 +75,8 @@ function(rapids_cpm_load_preset_versions) string(JSON package_name MEMBER "${json_data}" packages ${index}) string(JSON data GET "${json_data}" packages "${package_name}") - # Normalize the names all to lower case. This will allow us to better - # support overrides with different package name casing + # Normalize the names all to lower case. This will allow us to better support overrides with + # different package name casing string(TOLOWER package_name normalized_pkg_name) get_property(already_exists GLOBAL PROPERTY rapids_cpm_${normalized_pkg_name}_json SET) if(NOT already_exists) diff --git a/rapids-cmake/cpm/package_override.cmake b/rapids-cmake/cpm/package_override.cmake index 49b56a61..83108d85 100644 --- a/rapids-cmake/cpm/package_override.cmake +++ b/rapids-cmake/cpm/package_override.cmake @@ -95,17 +95,20 @@ function(rapids_cpm_package_override _rapids_override_filepath) foreach(index RANGE ${package_count}) string(JSON package_name MEMBER "${json_data}" packages ${index}) string(TOLOWER package_name normalized_pkg_name) - get_property(override_exists GLOBAL PROPERTY rapids_cpm_${normalized_pkg_name}_override_json DEFINED) + get_property(override_exists GLOBAL PROPERTY rapids_cpm_${normalized_pkg_name}_override_json + DEFINED) if(override_exists OR DEFINED CPM_${package_name}_SOURCE) continue() endif() - # Warn if our name all lower case matches a default package, but our - # case sensitive names doesn't ( ABC vs abc ) - get_property(package_proper_name GLOBAL PROPERTY rapids_cpm_${normalized_pkg_name}_proper_name) + # Warn if our name all lower case matches a default package, but our case sensitive names + # doesn't ( ABC vs abc ) + get_property(package_proper_name GLOBAL + PROPERTY rapids_cpm_${normalized_pkg_name}_proper_name) if(package_proper_name AND NOT package_proper_name STREQUAL package_name) - message(AUTHOR_WARNING "RAPIDS-CMake is assuming the override ${package_name} is meant for the ${package_proper_name} package. For correctness please use the correctly cased name") + message(AUTHOR_WARNING "RAPIDS-CMake is assuming the override ${package_name} is meant for the ${package_proper_name} package. For correctness please use the correctly cased name" + ) endif() if(NOT package_proper_name) set(package_proper_name ${package_name}) # Required for FetchContent_Declare