mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 12:35:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

update cuda requirement to 9.0, fixes #2791 (#2802)

Browse Source 
* update cuda requirement to 9.0, fixes #2791

* [cuda] Restore sample version blob
This commit is contained in:
Jason Juang 2018-02-15 17:42:35 -08:00 committed by Robert Schumacher
parent f279e9f5e3
commit d5cb490fc0
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/cuda/CONTROL
View File

@ -1,3 +1,3 @@
Source: cuda Source: cuda
Version: 8.0-1 Version: 9.0
Description: A parallel computing platform and programming model Description: A parallel computing platform and programming model

16
ports/cuda/portfile.cmake
View File

@ -20,26 +20,26 @@ if (NVCC)
RESULT_VARIABLE error_code) RESULT_VARIABLE error_code)
endif() endif()
# Sample output set(CUDA_REQUIRED_VERSION "V9.0.0")
# 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")
if (error_code) if (error_code)
message(FATAL_ERROR "Could not find CUDA. Before continuing, please download and install CUDA (${CUDA_REQUIRED_VERSION} or higher) from:" 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" "\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() 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}) string(REGEX MATCH "V([0-9]+)\\.([0-9]+)\\.([0-9]+)" CUDA_VERSION ${NVCC_OUTPUT})
message(STATUS "Found CUDA ${CUDA_VERSION}") message(STATUS "Found CUDA ${CUDA_VERSION}")
set(CUDA_VERSION_MAJOR ${CMAKE_MATCH_1}) set(CUDA_VERSION_MAJOR ${CMAKE_MATCH_1})
#set(CUDA_VERSION_MINOR ${CMAKE_MATCH_2}) #set(CUDA_VERSION_MINOR ${CMAKE_MATCH_2})
#set(CUDA_VERSION_PATCH ${CMAKE_MATCH_3}) #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:" 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") "\n https://developer.nvidia.com/cuda-downloads\n")
endif() endif()