improve build script based on user feedback

appveyor.yml

@@ -32,13 +32,10 @@ install:
   - cd %WORKSPACE%\
   - if [%USE_CUDA%]==[yes] curl -L https://developer.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.105_418.96_win10.exe -o setup.exe
   - if [%USE_CUDA%]==[yes] .\setup.exe -s nvcc_10.1 cuobjdump_10.1 nvprune_10.1 cupti_10.1 gpu_library_advisor_10.1 memcheck_10.1 nvdisasm_10.1 nvprof_10.1 visual_profiler_10.1 visual_studio_integration_10.1 cublas_10.1 cublas_dev_10.1 cudart_10.1 cufft_10.1 cufft_dev_10.1 curand_10.1 curand_dev_10.1 cusolver_10.1 cusolver_dev_10.1 cusparse_10.1 cusparse_dev_10.1 nvgraph_10.1 nvgraph_dev_10.1 npp_10.1 npp_dev_10.1 nvrtc_10.1 nvrtc_dev_10.1 nvml_dev_10.1 occupancy_calculator_10.1 fortran_examples_10.1
-  - if [%USE_CUDA%]==[yes] set CUDACXX=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v10.1\bin
-  - if [%USE_CUDA%]==[yes] set CMAKE_CUDA_COMPILER=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v10.1\bin
-  - if [%USE_CUDA%]==[yes] set CUDA_TOOLKIT_ROOT_DIR=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v10.1
   - if [%USE_CUDA%]==[yes] set CUDA_PATH=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v10.1
-  - if [%USE_CUDA%]==[yes] set CUDA_PATH_V10_1=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v10.1
+  - if [%USE_CUDA%]==[yes] set CUDA_PATH_V10_1=%CUDA_PATH%
-  - if [%USE_CUDA%]==[yes] set PATH=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v10.1\nvvm\bin;%PATH%
+  - if [%USE_CUDA%]==[yes] set CUDA_TOOLKIT_ROOT_DIR=%CUDA_PATH%
-  - if [%USE_CUDA%]==[yes] set PATH=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v10.1\bin;%PATH%
+  - if [%USE_CUDA%]==[yes] set PATH=%CUDA_PATH%\bin;%PATH%
   - cd %WORKSPACE%\
   - mkdir cygwin-downloads
   - ps: if($env:COMPILER -eq "cygwin") { Invoke-WebRequest https://cygwin.com/setup-x86_64.exe -OutFile $env:WORKSPACE\cygwin-setup.exe }

build.ps1

@@ -47,6 +47,22 @@ if ($null -eq (Get-Command "cl.exe" -ErrorAction SilentlyContinue)) {
   Write-Host "Visual Studio 2017 ${vstype} Command Prompt variables set.`n" -ForegroundColor Yellow
 }
 
+if ($null -eq (Get-Command "nvcc.exe" -ErrorAction SilentlyContinue)) {
+  if (Test-Path env:CUDA_PATH) {
+    $env:PATH += ";${env:CUDA_PATH}\bin"
+  }
+  else {
+    Write-Host "Unable to find CUDA, if necessary please install it or define a CUDA_PATH env variable pointing to the install folder`n" -ForegroundColor Yellow
+  }
+}
+
+if (Test-Path env:CUDA_PATH) {
+  if (-Not(Test-Path env:CUDA_TOOLKIT_ROOT_DIR)) {
+    $env:CUDA_TOOLKIT_ROOT_DIR = "${env:CUDA_PATH}"
+    Write-Host "Added missing env variable CUDA_TOOLKIT_ROOT_DIR`n" -ForegroundColor Yellow
+  }
+}
+
 if (Test-Path $vcpkg_path) {
   # RELEASE
   New-Item -Path .\build_win_release -ItemType directory -Force