diff options
author | Ray Molenkamp <github@lazydodo.com> | 2019-02-23 06:49:22 +0300 |
---|---|---|
committer | Ray Molenkamp <github@lazydodo.com> | 2019-02-23 06:54:27 +0300 |
commit | 1d2fc413c89d434f5d5e140cd01522e562c10ecd (patch) | |
tree | a049470989f1775a4b08ad06ce1521dd6de86047 /build_files/windows/detect_msvc2017.cmd | |
parent | 633b77b0eedb494ae9ddce22ee36bfb3bf698a15 (diff) |
make.bat: Preliminary Visual Studio 2019 support.
VS2019 is binary compatible with the existing vc14 libraries and no
new libraries libs are required in svn.
VS2019 support requires cmake 3.14.
VS2019 is still in pre-release state, you are required to explicitly
select the pre-release version by using:
make full 2019pre
Diffstat (limited to 'build_files/windows/detect_msvc2017.cmd')
-rw-r--r-- | build_files/windows/detect_msvc2017.cmd | 75 |
1 files changed, 1 insertions, 74 deletions
diff --git a/build_files/windows/detect_msvc2017.cmd b/build_files/windows/detect_msvc2017.cmd index a745d852616..5f760275f78 100644 --- a/build_files/windows/detect_msvc2017.cmd +++ b/build_files/windows/detect_msvc2017.cmd @@ -1,76 +1,3 @@ -if NOT "%verbose%" == "" ( - echo Detecting msvc 2017 -) set BUILD_VS_VER=15 set BUILD_VS_YEAR=2017 -set ProgramFilesX86=%ProgramFiles(x86)% -if not exist "%ProgramFilesX86%" set ProgramFilesX86=%ProgramFiles% - -set vs_where=%ProgramFilesX86%\Microsoft Visual Studio\Installer\vswhere.exe -if not exist "%vs_where%" ( - if NOT "%verbose%" == "" ( - echo Visual Studio 2017 ^(15.2 or newer^) is not detected - ) - goto FAIL -) - -if NOT "%verbose%" == "" ( - echo "%vs_where%" -latest %VSWHERE_ARGS% -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 - ) - -for /f "usebackq tokens=1* delims=: " %%i in (`"%vs_where%" -latest %VSWHERE_ARGS% -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64`) do ( - if /i "%%i"=="installationPath" set VS_InstallDir=%%j -) - -if "%VS_InstallDir%"=="" ( - if NOT "%verbose%" == "" ( - echo Visual Studio is detected but the "Desktop development with C++" workload has not been instlled - goto FAIL - ) -) - -set VCVARS=%VS_InstallDir%\VC\Auxiliary\Build\vcvarsall.bat -if exist "%VCVARS%" ( - call "%VCVARS%" %BUILD_ARCH% -) else ( - if NOT "%verbose%" == "" ( - echo "%VCVARS%" not found - ) - goto FAIL -) - -rem try msbuild -msbuild /version > NUL -if errorlevel 1 ( - if NOT "%verbose%" == "" ( - echo Visual Studio %BUILD_VS_YEAR% msbuild not found - ) - goto FAIL -) - -if NOT "%verbose%" == "" ( - echo Visual Studio %BUILD_VS_YEAR% msbuild found -) - -REM try the c++ compiler -cl 2> NUL 1>&2 -if errorlevel 1 ( - if NOT "%verbose%" == "" ( - echo Visual Studio %BUILD_VS_YEAR% C/C++ Compiler not found - ) - goto FAIL -) - -if NOT "%verbose%" == "" ( - echo Visual Studio %BUILD_VS_YEAR% C/C++ Compiler found -) - -if NOT "%verbose%" == "" ( - echo Visual Studio 2017 is detected successfully -) -goto EOF - -:FAIL -exit /b 1 - -:EOF +call "%~dp0\detect_msvc_vswhere.cmd" |