diff options
4 files changed, 16 insertions, 16 deletions
diff --git a/.ci/docker/uhd-builder-vs2017-v141-x64.Dockerfile b/.ci/docker/uhd-builder-vs2017-v141-x64.Dockerfile index b0b19350a..deaf4a9eb 100644 --- a/.ci/docker/uhd-builder-vs2017-v141-x64.Dockerfile +++ b/.ci/docker/uhd-builder-vs2017-v141-x64.Dockerfile @@ -15,7 +15,7 @@ RUN @"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" \ -Command "[System.Net.ServicePointManager]::SecurityProtocol = 3072; \
iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && \
SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
-RUN choco install -y cmake.install --installargs 'ADD_CMAKE_TO_PATH=System' --version=3.19.6
+RUN choco install -y cmake.install --installargs 'ADD_CMAKE_TO_PATH=System' --version=3.22.3
RUN choco install -y doxygen.install --version=1.9.1
RUN choco install -y git
RUN choco install -y NSIS --version=3.06.1
@@ -34,9 +34,9 @@ RUN "%TEMP%\vs_buildtools.exe" --quiet --wait --norestart --noUpdateInstaller \ RUN setx VCPKG_INSTALL_DIR "c:\\vcpkg" /m
RUN git clone https://github.com/microsoft/vcpkg %VCPKG_INSTALL_DIR% && \
cd %VCPKG_INSTALL_DIR% && \
- # The vcpkg git commit sets the toolchain dependenices
- # This commit uses Boost 1.75 and libusb 1.0.24
- git checkout 3426db05b996481ca31e95fff3734cf23e0f51bc && \
+ # The vcpkg git tag sets the toolchain dependenices
+ # This commit uses Boost 1.78 and libusb 1.0.24
+ git checkout 2022.03.10 && \
bootstrap-vcpkg.bat
# Add custom UHD vcpkg triplet
COPY host/cmake/vcpkg/* c:/vcpkg/triplets/
diff --git a/.ci/docker/uhd-builder-vs2017-v141-x86.Dockerfile b/.ci/docker/uhd-builder-vs2017-v141-x86.Dockerfile index a6366756f..738a6e77b 100644 --- a/.ci/docker/uhd-builder-vs2017-v141-x86.Dockerfile +++ b/.ci/docker/uhd-builder-vs2017-v141-x86.Dockerfile @@ -15,7 +15,7 @@ RUN @"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" \ -Command "[System.Net.ServicePointManager]::SecurityProtocol = 3072; \
iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && \
SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
-RUN choco install -y cmake.install --installargs 'ADD_CMAKE_TO_PATH=System' --version=3.19.6
+RUN choco install -y cmake.install --installargs 'ADD_CMAKE_TO_PATH=System' --version=3.22.3
RUN choco install -y doxygen.install --version=1.9.1
RUN choco install -y git
RUN choco install -y NSIS --version=3.06.1
@@ -34,9 +34,9 @@ RUN "%TEMP%\vs_buildtools.exe" --quiet --wait --norestart --noUpdateInstaller \ RUN setx VCPKG_INSTALL_DIR "c:\\vcpkg" /m
RUN git clone https://github.com/microsoft/vcpkg %VCPKG_INSTALL_DIR% && \
cd %VCPKG_INSTALL_DIR% && \
- # The vcpkg git commit sets the toolchain dependenices
- # This commit uses Boost 1.75 and libusb 1.0.24
- git checkout 3426db05b996481ca31e95fff3734cf23e0f51bc && \
+ # The vcpkg git tag sets the toolchain dependenices
+ # This commit uses Boost 1.78 and libusb 1.0.24
+ git checkout 2022.03.10 && \
bootstrap-vcpkg.bat
# Add custom UHD vcpkg triplet
COPY host/cmake/vcpkg/* c:/vcpkg/triplets/
diff --git a/.ci/docker/uhd-builder-vs2019-v142-x64.Dockerfile b/.ci/docker/uhd-builder-vs2019-v142-x64.Dockerfile index 7c4ff74e1..d2c2c2c20 100644 --- a/.ci/docker/uhd-builder-vs2019-v142-x64.Dockerfile +++ b/.ci/docker/uhd-builder-vs2019-v142-x64.Dockerfile @@ -15,7 +15,7 @@ RUN @"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" \ -Command "[System.Net.ServicePointManager]::SecurityProtocol = 3072; \
iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && \
SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
-RUN choco install -y cmake.install --installargs 'ADD_CMAKE_TO_PATH=System' --version=3.19.6
+RUN choco install -y cmake.install --installargs 'ADD_CMAKE_TO_PATH=System' --version=3.22.3
RUN choco install -y doxygen.install --version=1.9.1
RUN choco install -y git
RUN choco install -y NSIS --version=3.06.1
@@ -33,9 +33,9 @@ RUN "%TEMP%\vs_buildtools.exe" --quiet --wait --norestart --noUpdateInstaller \ RUN setx VCPKG_INSTALL_DIR "c:\\vcpkg" /m
RUN git clone https://github.com/microsoft/vcpkg %VCPKG_INSTALL_DIR% && \
cd %VCPKG_INSTALL_DIR% && \
- # The vcpkg git commit sets the toolchain dependenices
- # This commit uses Boost 1.75 and libusb 1.0.24
- git checkout 3426db05b996481ca31e95fff3734cf23e0f51bc && \
+ # The vcpkg git tag sets the toolchain dependenices
+ # This commit uses Boost 1.78 and libusb 1.0.24
+ git checkout 2022.03.10 && \
bootstrap-vcpkg.bat
# Add custom UHD vcpkg triplet
COPY host/cmake/vcpkg/* c:/vcpkg/triplets/
diff --git a/.ci/docker/uhd-builder-vs2019-v142-x86.Dockerfile b/.ci/docker/uhd-builder-vs2019-v142-x86.Dockerfile index 8b4000f1c..3fe88d826 100644 --- a/.ci/docker/uhd-builder-vs2019-v142-x86.Dockerfile +++ b/.ci/docker/uhd-builder-vs2019-v142-x86.Dockerfile @@ -15,7 +15,7 @@ RUN @"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" \ -Command "[System.Net.ServicePointManager]::SecurityProtocol = 3072; \
iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && \
SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
-RUN choco install -y cmake.install --installargs 'ADD_CMAKE_TO_PATH=System' --version=3.19.6
+RUN choco install -y cmake.install --installargs 'ADD_CMAKE_TO_PATH=System' --version=3.22.3
RUN choco install -y doxygen.install --version=1.9.1
RUN choco install -y git
RUN choco install -y NSIS --version=3.06.1
@@ -33,9 +33,9 @@ RUN "%TEMP%\vs_buildtools.exe" --quiet --wait --norestart --noUpdateInstaller \ RUN setx VCPKG_INSTALL_DIR "c:\\vcpkg" /m
RUN git clone https://github.com/microsoft/vcpkg %VCPKG_INSTALL_DIR% && \
cd %VCPKG_INSTALL_DIR% && \
- # The vcpkg git commit sets the toolchain dependenices
- # This commit uses Boost 1.75 and libusb 1.0.24
- git checkout 3426db05b996481ca31e95fff3734cf23e0f51bc && \
+ # The vcpkg git tag sets the toolchain dependenices
+ # This commit uses Boost 1.78 and libusb 1.0.24
+ git checkout 2022.03.10 && \
bootstrap-vcpkg.bat
# Add custom UHD vcpkg triplet
COPY host/cmake/vcpkg/* c:/vcpkg/triplets/
|