Skip to content

Commit

Permalink
Update to CPM version 0.35.5 (#249)
Browse files Browse the repository at this point in the history
CPM has been updated to fix the breaking behavior we found in 0.35.4.

Authors:
  - Robert Maynard (https://github.com/robertmaynard)

Approvers:
  - Jason Lowe (https://github.com/jlowe)

URL: #249
  • Loading branch information
robertmaynard authored Aug 22, 2022
1 parent 374b530 commit badc68e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion rapids-cmake/cpm/detail/download.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function(rapids_cpm_download)
list(APPEND CMAKE_MESSAGE_CONTEXT "rapids.cpm.download")

# When changing version verify no new variables needs to be propagated
set(CPM_DOWNLOAD_VERSION 0.35.3)
set(CPM_DOWNLOAD_VERSION 0.35.5)

if(CPM_SOURCE_CACHE)
# Expand relative path. This is important if the provided path contains a tilde (~)
Expand Down
5 changes: 5 additions & 0 deletions rapids-cmake/cpm/detail/get_proprietary_binary.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@ function(rapids_cpm_get_proprietary_binary package_name version)
include(FetchContent)
set(pkg_name "${package_name}_proprietary_binary")

if(POLICY CMP0135)
cmake_policy(SET CMP0135 NEW)
set(CMAKE_POLICY_DEFAULT_CMP0135 NEW)
endif()

FetchContent_Declare(${pkg_name} URL ${proprietary_binary})
FetchContent_MakeAvailable(${pkg_name})

Expand Down
7 changes: 0 additions & 7 deletions rapids-cmake/cpm/init.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,6 @@ function(rapids_cpm_init)
rapids_cpm_package_override("${_RAPIDS_OVERRIDE}")
endif()

# Prefer to use the download time for timestamp, instead of the timestamp in the archive unless
# explicitly set by user. This allows for proper rebuilds when a projects url changes
if(POLICY CMP0135)
cmake_policy(SET CMP0135 NEW)
set(CMAKE_POLICY_DEFAULT_CMP0135 NEW CACHE STRING "")
endif()

include("${rapids-cmake-dir}/cpm/detail/download.cmake")
rapids_cpm_download()

Expand Down

0 comments on commit badc68e

Please sign in to comment.