diff --git a/docker/windows/install_choco.ps1 b/docker/windows/install_choco.ps1 index 8ab6474043..f1a7c380a3 100644 --- a/docker/windows/install_choco.ps1 +++ b/docker/windows/install_choco.ps1 @@ -1,4 +1,5 @@ Write-Host "Installing Choco" Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) Write-Host "Installing Choco packages" -choco install -y python3 git git-lfs 7zip +choco install -y cmake --installargs 'ADD_CMAKE_TO_PATH=System' +choco install -y python3 git git-lfs 7zip \ No newline at end of file diff --git a/docker/windows/install_toolchain.ps1 b/docker/windows/install_toolchain.ps1 index ed3fff394e..66a4df73b0 100644 --- a/docker/windows/install_toolchain.ps1 +++ b/docker/windows/install_toolchain.ps1 @@ -1,7 +1,6 @@ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $msvc_2017_url = 'https://aka.ms/vs/15/release/vs_buildtools.exe' -$cmake_url = 'https://github.com/Kitware/CMake/releases/download/v3.16.1/cmake-3.16.1-win64-x64.msi' $msys2_url = 'https://netcologne.dl.sourceforge.net/project/msys2/Base/x86_64/msys2-base-x86_64-20190524.tar.xz' $msys_mingw_get_url = 'https://dotsrc.dl.osdn.net/osdn/mingw/68260/mingw-get-0.6.3-mingw32-pre-20170905-1-bin.tar.xz' @@ -10,11 +9,6 @@ Invoke-WebRequest -Uri $msvc_2017_url -OutFile C:\vs_buildtools.exe Start-Process C:\vs_buildtools.exe -ArgumentList '--quiet --wait --norestart --nocache --installPath C:\BuildTools --add Microsoft.VisualStudio.Workload.VCTools --includeRecommended' -Wait Remove-Item C:\vs_buildtools.exe -Force -Write-Host "Installing CMake for Cerbero" -Invoke-WebRequest -Uri $cmake_url -OutFile C:\cmake-x64.msi -Start-Process msiexec -ArgumentList '-i C:\cmake-x64.msi -quiet -norestart ADD_CMAKE_TO_PATH=System' -Wait -Remove-Item C:\cmake-x64.msi -Force - Write-Host "Downloading and extracting mingw-get for MSYS" Invoke-WebRequest -Uri $msys_mingw_get_url -OutFile C:\mingw-get.tar.xz 7z e C:\mingw-get.tar.xz -o"C:\\"