Skip to content

Commit

Permalink
Correct style issues
Browse files Browse the repository at this point in the history
  • Loading branch information
robertmaynard committed Oct 4, 2023
1 parent cb2937c commit 3f179d0
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 7 deletions.
5 changes: 3 additions & 2 deletions rapids-cmake/cpm/nvcomp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,8 @@ function(rapids_cpm_nvcomp)
endif()

# point our consumers to where they can find the pre-built version
rapids_export_find_package_root(BUILD nvcomp "${nvcomp_ROOT}" EXPORT_SET
${_RAPIDS_BUILD_EXPORT_SET} CONDITION nvcomp_proprietary_binary)
rapids_export_find_package_root(BUILD nvcomp "${nvcomp_ROOT}"
EXPORT_SET ${_RAPIDS_BUILD_EXPORT_SET}
CONDITION nvcomp_proprietary_binary)

endfunction()
4 changes: 2 additions & 2 deletions rapids-cmake/cpm/thrust.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ function(rapids_cpm_thrust NAMESPACE namespaces_name)
# Store where CMake can find the Thrust-config.cmake that comes part of Thrust source code
include("${rapids-cmake-dir}/export/find_package_root.cmake")
include("${rapids-cmake-dir}/export/detail/post_find_package_code.cmake")
rapids_export_find_package_root(BUILD Thrust "${Thrust_SOURCE_DIR}/cmake" EXPORT_SET
${_RAPIDS_BUILD_EXPORT_SET})
rapids_export_find_package_root(BUILD Thrust "${Thrust_SOURCE_DIR}/cmake"
EXPORT_SET ${_RAPIDS_BUILD_EXPORT_SET})
rapids_export_post_find_package_code(BUILD Thrust "${post_find_code}" EXPORT_SET
${_RAPIDS_BUILD_EXPORT_SET})

Expand Down
4 changes: 2 additions & 2 deletions rapids-cmake/export/find_package_file.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#=============================================================================
# Copyright (c) 2021, NVIDIA CORPORATION.
# Copyright (c) 2021-2023, NVIDIA CORPORATION.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -60,7 +60,7 @@ rapids-cmake to ensure it is installed correct and added to
will cause the associated call to be ignored.
#]=======================================================================]
function(rapids_export_find_package_file type file_path )
function(rapids_export_find_package_file type file_path)
list(APPEND CMAKE_MESSAGE_CONTEXT "rapids.export.find_package_file")
include("${rapids-cmake-dir}/cmake/detail/policy.cmake")

Expand Down
2 changes: 1 addition & 1 deletion rapids-cmake/export/find_package_root.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ will find the packaged dependency.
#]=======================================================================]
function(rapids_export_find_package_root type name dir_path)
list(APPEND CMAKE_MESSAGE_CONTEXT "rapids.export.find_package_root_dir")
include("${rapids-cmake-dir}/cmake/detail/policy.cmake")
include("${rapids-cmake-dir}/cmake/detail/policy.cmake")


set(options "")
Expand Down
15 changes: 15 additions & 0 deletions testing/export/find_package_file-deprecated.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
#=============================================================================
# Copyright (c) 2023, NVIDIA CORPORATION.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#=============================================================================
include(${rapids-cmake-dir}/export/find_package_file.cmake)

project(rapids-project LANGUAGES CUDA)
Expand Down
15 changes: 15 additions & 0 deletions testing/export/find_package_root-deprecated.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
#=============================================================================
# Copyright (c) 2023, NVIDIA CORPORATION.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#=============================================================================
include(${rapids-cmake-dir}/export/find_package_root.cmake)

project(rapids-project LANGUAGES CUDA)
Expand Down

0 comments on commit 3f179d0

Please sign in to comment.