diff options
| author | Steven Koo <steven.koo@ni.com> | 2022-03-28 16:20:39 -0500 |
|---|---|---|
| committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2022-03-29 05:22:15 -0700 |
| commit | 53b8e1b7f54e693b310a108045785e60d391ec45 (patch) | |
| tree | 8788c00f3ed38e26c49e7a11111fc73431d142c2 /.ci/docker/uhd-builder-vs2019-v142-x86.Dockerfile | |
| parent | 7753371e8b3ce916335ff5dc81fe8f5333a7d3d3 (diff) | |
| download | uhd-53b8e1b7f54e693b310a108045785e60d391ec45.tar.gz uhd-53b8e1b7f54e693b310a108045785e60d391ec45.tar.bz2 uhd-53b8e1b7f54e693b310a108045785e60d391ec45.zip | |
ci: Update commit vcpkg and CMake version
Signed-off-by: Steven Koo <steven.koo@ni.com>
Diffstat (limited to '.ci/docker/uhd-builder-vs2019-v142-x86.Dockerfile')
| -rw-r--r-- | .ci/docker/uhd-builder-vs2019-v142-x86.Dockerfile | 8 |
1 files changed, 4 insertions, 4 deletions
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/
|