diff options
| author | Jason Juang <jasjuang@gmail.com> | 2018-02-15 17:42:35 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-02-15 17:42:35 -0800 |
| commit | d5cb490fc02b9b0c26d869fabf3b37158586236f (patch) | |
| tree | 8bcae187750012fc0a8ce1871e33f32a51ca4e03 | |
| parent | f279e9f5e3a569b237dbaca44bbc7225f1d7e27d (diff) | |
| download | vcpkg-d5cb490fc02b9b0c26d869fabf3b37158586236f.tar.gz vcpkg-d5cb490fc02b9b0c26d869fabf3b37158586236f.zip | |
update cuda requirement to 9.0, fixes #2791 (#2802)
* update cuda requirement to 9.0, fixes #2791
* [cuda] Restore sample version blob
| -rw-r--r-- | ports/cuda/CONTROL | 2 | ||||
| -rw-r--r-- | ports/cuda/portfile.cmake | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/ports/cuda/CONTROL b/ports/cuda/CONTROL index 0bf29b7b6..271869e8b 100644 --- a/ports/cuda/CONTROL +++ b/ports/cuda/CONTROL @@ -1,3 +1,3 @@ Source: cuda -Version: 8.0-1 +Version: 9.0 Description: A parallel computing platform and programming model
\ No newline at end of file diff --git a/ports/cuda/portfile.cmake b/ports/cuda/portfile.cmake index ee876ce50..7cc1773db 100644 --- a/ports/cuda/portfile.cmake +++ b/ports/cuda/portfile.cmake @@ -20,26 +20,26 @@ if (NVCC) RESULT_VARIABLE error_code) endif() -# Sample output -# NVIDIA (R) Cuda compiler driver -# Copyright (c) 2005-2016 NVIDIA Corporation -# Built on Sat_Sep__3_19:05:48_CDT_2016 -# Cuda compilation tools, release 8.0, V8.0.44 -set(CUDA_REQUIRED_VERSION "V8.0.0") +set(CUDA_REQUIRED_VERSION "V9.0.0") if (error_code) message(FATAL_ERROR "Could not find CUDA. Before continuing, please download and install CUDA (${CUDA_REQUIRED_VERSION} or higher) from:" "\n https://developer.nvidia.com/cuda-downloads\n" - "\nAlso ensure vcpkg has been rebuilt with the latest version (v0.0.79 or later)") + "\nAlso ensure vcpkg has been rebuilt with the latest version (v0.0.104 or later)") endif() +# Sample output: +# NVIDIA (R) Cuda compiler driver +# Copyright (c) 2005-2016 NVIDIA Corporation +# Built on Sat_Sep__3_19:05:48_CDT_2016 +# Cuda compilation tools, release 8.0, V8.0.44 string(REGEX MATCH "V([0-9]+)\\.([0-9]+)\\.([0-9]+)" CUDA_VERSION ${NVCC_OUTPUT}) message(STATUS "Found CUDA ${CUDA_VERSION}") set(CUDA_VERSION_MAJOR ${CMAKE_MATCH_1}) #set(CUDA_VERSION_MINOR ${CMAKE_MATCH_2}) #set(CUDA_VERSION_PATCH ${CMAKE_MATCH_3}) -if (CUDA_VERSION_MAJOR LESS 8) +if (CUDA_VERSION_MAJOR LESS 9) message(FATAL_ERROR "CUDA ${CUDA_VERSION} but ${CUDA_REQUIRED_VERSION} is required. Please download and install a more recent version of CUDA from:" "\n https://developer.nvidia.com/cuda-downloads\n") endif() |