diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 74ee39e87263b..9a2dce7272303 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -40,15 +40,6 @@ jobs: - name: Install NASM run: | choco install -y nasm - dir "C:/Program Files/NASM" - - - name: Install NASM - shell: pwsh - run: | - mkdir -p ${{ github.workspace }}\temp\nasm - Invoke-WebRequest "https://www.nasm.us/pub/nasm/releasebuilds/2.16.01/win64/nasm-2.16.01-win64.zip" -OutFile "${{ github.workspace }}\temp\nasm.zip" - Expand-Archive -LiteralPath '${{ github.workspace }}\temp\nasm.zip' -DestinationPath 'C:/nasm' - ls 'C:/nasm' - name: CMake version installed with Visual Studio shell: pwsh diff --git a/build_windows_64/ZERO_CHECK.vcxproj b/build_windows_64/ZERO_CHECK.vcxproj index f67b48c6c1d10..97a89985555d6 100644 --- a/build_windows_64/ZERO_CHECK.vcxproj +++ b/build_windows_64/ZERO_CHECK.vcxproj @@ -125,7 +125,7 @@ Always Checking Build System setlocal -"$(VCIDEInstallDir)..\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -S$(SolutionDir)../grpc -B$(SolutionDir) --check-stamp-list CMakeFiles/generate.stamp.list --vs-solution-file $(SolutionDir)/grpc.sln +"$(VCIDEInstallDir)..\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -S$(SolutionDir) -B$(SolutionDir) --check-stamp-list CMakeFiles/generate.stamp.list --vs-solution-file $(SolutionDir)/grpc.sln if %errorlevel% neq 0 goto :cmEnd :cmEnd endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone @@ -138,7 +138,7 @@ if %errorlevel% neq 0 goto :VCEnd false Checking Build System setlocal -"$(VCIDEInstallDir)..\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -S$(SolutionDir)../grpc -B$(SolutionDir) --check-stamp-list CMakeFiles/generate.stamp.list --vs-solution-file $(SolutionDir)/grpc.sln +"$(VCIDEInstallDir)..\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -S$(SolutionDir) -B$(SolutionDir) --check-stamp-list CMakeFiles/generate.stamp.list --vs-solution-file $(SolutionDir)/grpc.sln if %errorlevel% neq 0 goto :cmEnd :cmEnd endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone @@ -151,7 +151,7 @@ if %errorlevel% neq 0 goto :VCEnd false Checking Build System setlocal -"$(VCIDEInstallDir)..\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -S$(SolutionDir)../grpc -B$(SolutionDir) --check-stamp-list CMakeFiles/generate.stamp.list --vs-solution-file $(SolutionDir)/grpc.sln +"$(VCIDEInstallDir)..\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -S$(SolutionDir) -B$(SolutionDir) --check-stamp-list CMakeFiles/generate.stamp.list --vs-solution-file $(SolutionDir)/grpc.sln if %errorlevel% neq 0 goto :cmEnd :cmEnd endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone @@ -164,7 +164,7 @@ if %errorlevel% neq 0 goto :VCEnd false Checking Build System setlocal -"$(VCIDEInstallDir)..\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -S$(SolutionDir)../grpc -B$(SolutionDir) --check-stamp-list CMakeFiles/generate.stamp.list --vs-solution-file $(SolutionDir)/grpc.sln +"$(VCIDEInstallDir)..\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -S$(SolutionDir) -B$(SolutionDir) --check-stamp-list CMakeFiles/generate.stamp.list --vs-solution-file $(SolutionDir)/grpc.sln if %errorlevel% neq 0 goto :cmEnd :cmEnd endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone