More minor fixes (#37)

peterjc123 · web-flow · commit c1b4fb60e8eb · 2018-11-02T13:46:56.000+08:00
* More minor fixes

* Fixes auto configuration
diff --git a/auto.bat b/auto.bat
@@ -36,8 +36,7 @@ IF NOT "%CUDA_PATH_V8_0%"=="" IF "%CUDA_PATH_V8_0%"=="%CUDA_PATH%" (
         set NO_CUDA=1
     ) ELSE (
         set CMAKE_GENERATOR=Visual Studio 14 2015 Win64
-        set "PREBUILD_COMMAND=%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat"
-        set PREBUILD_COMMAND_ARGS=x86_amd64
+        set "CUDAHOSTCXX=%VS140COMNTOOLS%\..\..\VC\bin\amd64\cl.exe"
     )
 )
 
diff --git a/cuda80.bat b/cuda80.bat
@@ -35,8 +35,7 @@ IF "%CUDA_PATH_V8_0%"=="" (
         set "CUDA_PATH=%CUDA_PATH_V8_0%"
         set "PATH=%CUDA_PATH_V8_0%\bin;%PATH%"
         set CMAKE_GENERATOR=Visual Studio 14 2015 Win64
-        set "PREBUILD_COMMAND=%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat"
-        set PREBUILD_COMMAND_ARGS=x86_amd64
+        set "CUDAHOSTCXX=%VS140COMNTOOLS%\..\..\VC\bin\amd64\cl.exe"
     )
 )
 
diff --git a/internal/check_opts.bat b/internal/check_opts.bat
@@ -48,7 +48,7 @@ IF exist "%MKLProductDir%\mkl\lib\intel64_win" (
 
 if "%NO_CUDA%"=="" (
     IF "%MAGMA_HOME%" == "" (
-        echo MAGMA_HOME is set. MAGMA will be inclued in build.
+        echo MAGMA_HOME is set. MAGMA will be included in build.
     ) ELSE (
         echo MAGMA_HOME not set. Skip MAGMA in build.
     )
diff --git a/internal/setup.bat b/internal/setup.bat
@@ -24,6 +24,8 @@ setlocal DisableDelayedExpansion
 
 :yes
 
+IF NOT "%CMAKE_GENERATOR%" == "Ninja" goto reactivate_end
+
 set SRC_DIR=%~dp0\..
 
 setlocal

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,7 @@ IF NOT "%CUDA_PATH_V8_0%"=="" IF "%CUDA_PATH_V8_0%"=="%CUDA_PATH%" (`
`36`	`36`	`set NO_CUDA=1`
`37`	`37`	`) ELSE (`
`38`	`38`	`set CMAKE_GENERATOR=Visual Studio 14 2015 Win64`
`39`		`- set "PREBUILD_COMMAND=%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat"`
`40`		`- set PREBUILD_COMMAND_ARGS=x86_amd64`
	`39`	`+ set "CUDAHOSTCXX=%VS140COMNTOOLS%\..\..\VC\bin\amd64\cl.exe"`
`41`	`40`	`)`
`42`	`41`	`)`
`43`	`42`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,7 @@ IF "%CUDA_PATH_V8_0%"=="" (`
`35`	`35`	`set "CUDA_PATH=%CUDA_PATH_V8_0%"`
`36`	`36`	`set "PATH=%CUDA_PATH_V8_0%\bin;%PATH%"`
`37`	`37`	`set CMAKE_GENERATOR=Visual Studio 14 2015 Win64`
`38`		`- set "PREBUILD_COMMAND=%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat"`
`39`		`- set PREBUILD_COMMAND_ARGS=x86_amd64`
	`38`	`+ set "CUDAHOSTCXX=%VS140COMNTOOLS%\..\..\VC\bin\amd64\cl.exe"`
`40`	`39`	`)`
`41`	`40`	`)`
`42`	`41`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ IF exist "%MKLProductDir%\mkl\lib\intel64_win" (`
`48`	`48`
`49`	`49`	`if "%NO_CUDA%"=="" (`
`50`	`50`	`IF "%MAGMA_HOME%" == "" (`
`51`		`- echo MAGMA_HOME is set. MAGMA will be inclued in build.`
	`51`	`+ echo MAGMA_HOME is set. MAGMA will be included in build.`
`52`	`52`	`) ELSE (`
`53`	`53`	`echo MAGMA_HOME not set. Skip MAGMA in build.`
`54`	`54`	`)`