From 69e30e1728c422a0f52f455cf17c3702898aa649 Mon Sep 17 00:00:00 2001 From: Jean Felder Date: Fri, 26 Apr 2024 21:03:49 +0200 Subject: [PATCH] fix --- Dockerfile.windows | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Dockerfile.windows b/Dockerfile.windows index 9c969c25..52ad7fc0 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -13,16 +13,20 @@ RUN Start-Process -FilePath "$env:TEMP\vs_buildtools.exe" \ "--includeRecommended" \ -Wait +# install git from choco +RUN iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')); \ + choco install git -y --no-progress + # install vcpkg # RUN $env:VCPKG_INSTALL_DIR="c:\\vcpkg" # RUN $env:VCPKG_DEFAULT_TRIPLET="x64-windows" -RUN git clone https://github.com/microsoft/vcpkg c:\vcpkg && \ - cd c:\vcpkg && \ - bootstrap-vcpkg.bat -disableMetrics && \ +RUN git clone https://github.com/microsoft/vcpkg c:\vcpkg; \ + cd c:\vcpkg; \ + bootstrap-vcpkg.bat -disableMetrics; \ .\vcpkg install cgal boost-program-options boost-timer boost-test --triplet x64-windows # build sfcgal -RUN cd $env:starter_path && \ +RUN cd $env:starter_path; \ cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DSFCGAL_BUILD_TESTS=OFF -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALL_DIR\scripts\buildsystems\vcpkg.cmake" # Restore default shell for Windows containers.