diff options
| author | Aaron <carlisle.b3d@gmail.com> | 2017-01-19 23:55:50 +0300 |
|---|---|---|
| committer | Aaron <carlisle.b3d@gmail.com> | 2017-01-20 00:00:52 +0300 |
| commit | c91bdaf55b26bf156619f20ae6d9779ced56a7f5 (patch) | |
| tree | 9f2657905b23cfcb24504e5c625453ef0a4deff6 /make.bat | |
| parent | 2a2ae9c3fa680b84b9fef3c29f10739a5c3da7a5 (diff) | |
Build dir should be set after the sanity checks
Error here is that if do not have 2012 it switch to 2015 but not change the build dir
Diffstat (limited to 'make.bat')
| -rw-r--r-- | make.bat | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -129,9 +129,6 @@ if "%BUILD_ARCH%"=="x64" ( ) -set BUILD_DIR=%BUILD_DIR%_%TARGET%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE% - - if "%target%"=="Release" ( rem for vc12 check for both cuda 7.5 and 8 if "%CUDA_PATH%"=="" ( @@ -173,7 +170,7 @@ where /Q msbuild if %ERRORLEVEL% NEQ 0 ( if "%BUILD_VS_VER%"=="12" ( rem vs12 not found, try vs14 - echo Visual Studio 2012 not found, trying Visual Studio 2015. + echo Visual Studio 2013 not found, trying Visual Studio 2015. set BUILD_VS_VER=14 set BUILD_VS_YEAR=2015 goto DetectMSVC @@ -184,6 +181,11 @@ if %ERRORLEVEL% NEQ 0 ( goto EOF ) ) + + +set BUILD_DIR=%BUILD_DIR%_%TARGET%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE% + + where /Q cmake if %ERRORLEVEL% NEQ 0 ( echo Error: "CMake" command not in the PATH. |