From fcb24f7d0dc955e1cdfbfce70e300f4df2f20ecf Mon Sep 17 00:00:00 2001 From: Helena Kotas Date: Tue, 22 Sep 2020 16:40:19 -0700 Subject: [PATCH] Remove VS checks that assume Visual Studio is installed on C: drive These checks were there only to provide a nice error message when VS 2019 is not installed but it does not take into account that it can be installed at other locations than the default one. Removing these will still result in an error from cmake if it can't find Visual Studio installed. --- utils/hct/hctbuild.cmd | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/utils/hct/hctbuild.cmd b/utils/hct/hctbuild.cmd index 15f6c48cc8..47647a2641 100644 --- a/utils/hct/hctbuild.cmd +++ b/utils/hct/hctbuild.cmd @@ -179,22 +179,6 @@ if "%1"=="-dxc-cmake-ends-include" ( shift /1 ) -rem If only VS 2019 is available, pick that by default. -if "%BUILD_VS_VER%"=="2017" ( - if not exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2017" ( - echo "Cannot find Visual Studio 2017 at %ProgramFiles(x86)%\Microsoft Visual Studio\2017." - echo "Use hctbuild without -vs2017 (or with -vs2019) to build with Visual Studio 2019." - exit /b 1 - ) -) -if "%BUILD_VS_VER%"=="2019" ( - if not exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2019" ( - echo "Cannot find Visual Studio 2019 at %ProgramFiles(x86)%\Microsoft Visual Studio\2019." - echo "Use hctbuild -vs2017 to build with Visual Studio 2017." - exit /b 1 - ) -) - rem Begin SPIRV change if "%1"=="-spirv" ( echo SPIR-V codegen is enabled.