Add additional check for NVTX

Author: peterjc123

auto.bat

@@ -9,14 +9,21 @@ call internal\check_deps.bat
 IF ERRORLEVEL 1 goto eof
 
 REM Check for optional components
+
 set NO_CUDA=
+set CMAKE_GENERATOR=Visual Studio 15 2017 Win64
 
 IF "%CUDA_PATH_V8_0%"==""  IF "%CUDA_PATH_V9_0%"=="" (
     echo CUDA 8/9 not found, disabling it
     set NO_CUDA=1
+    goto optcheck
 )
 
-set CMAKE_GENERATOR=Visual Studio 15 2017 Win64
+IF "%NVTOOLSEXT_PATH%"=="" (
+    echo NVTX (Visual Studio Extension for CUDA) not installed, disabling CUDA
+    set NO_CUDA=1
+    goto optcheck
+)
 
 IF NOT "%CUDA_PATH_V8_0%"=="" IF "%CUDA_PATH_V8_0%"=="%CUDA_PATH%" (
     IF "%VS140COMNTOOLS%"=="" (
@@ -29,6 +36,8 @@ IF NOT "%CUDA_PATH_V8_0%"=="" IF "%CUDA_PATH_V8_0%"=="%CUDA_PATH%" (
     )
 )
 
+:optcheck
+
 call internal\check_opts.bat
 IF ERRORLEVEL 1 goto eof
 

cuda8.bat

@@ -10,8 +10,15 @@ IF ERRORLEVEL 1 goto eof
 
 REM Check for optional components
 
+set NO_CUDA=
 set CMAKE_GENERATOR=Visual Studio 15 2017 Win64
 
+IF "%NVTOOLSEXT_PATH%"=="" (
+    echo NVTX (Visual Studio Extension for CUDA) not installed, disabling CUDA
+    set NO_CUDA=1
+    goto optcheck
+)
+
 IF "%CUDA_PATH_V8_0%"=="" (
     echo CUDA 8 not found, disabling it
     set NO_CUDA=1
@@ -25,11 +32,10 @@ IF "%CUDA_PATH_V8_0%"=="" (
         set CMAKE_GENERATOR=Visual Studio 14 2015 Win64
         set "PREBUILD_COMMAND=%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat"
         set PREBUILD_COMMAND_ARGS=x86_amd64
-        set NO_CUDA=
     )
 )
 
-echo %CUDA_PATH%
+:optcheck
 
 call internal\check_opts.bat
 IF ERRORLEVEL 1 goto eof

cuda9.bat

@@ -9,7 +9,15 @@ call internal\check_deps.bat
 IF ERRORLEVEL 1 goto eof
 
 REM Check for optional components
+
 set NO_CUDA=
+set CMAKE_GENERATOR=Visual Studio 15 2017 Win64
+
+IF "%NVTOOLSEXT_PATH%"=="" (
+    echo NVTX (Visual Studio Extension for CUDA) not installed, disabling CUDA
+    set NO_CUDA=1
+    goto optcheck
+)
 
 IF "%CUDA_PATH_V9_0%"=="" (
     echo CUDA 9 not found, disabling it
@@ -19,7 +27,7 @@ IF "%CUDA_PATH_V9_0%"=="" (
     set PATH=%CUDA_PATH_V9_0%\bin;%PATH%
 )
 
-set CMAKE_GENERATOR=Visual Studio 15 2017 Win64
+:optcheck
 
 call internal\check_opts.bat
 IF ERRORLEVEL 1 goto eof