cp missed vcpkg packages (#113)

* cp missed vcpkg packages * mv downloads copy to install.bat * Update install.bat
MeshInspector · Apr 12, 2022 · e30335c · e30335c
1 parent f031459
commit e30335c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/docker/windowsDockerfile b/docker/windowsDockerfile
@@ -51,7 +51,6 @@ RUN sudo vcpkg integrate install
 # Install vcpkg requirements
 WORKDIR "C:\\vcpkg"
 COPY ./thirdparty/vcpkg/triplets/x64-windows-meshrus.cmake ./triplets
-COPY ./thirdparty/vcpkg/downloads  ./downloads
 RUN C:\\workspace\\MeshLib\\thirdparty\\install.bat && rmdir /s /q buildtrees downloads ports packages
 
 WORKDIR "C:\\workspace"

diff --git a/thirdparty/install.bat b/thirdparty/install.bat
@@ -1,2 +1,7 @@
-set VCPKG_DEFAULT_TRIPLET=x64-windows-meshrus
-vcpkg install "@%~dp0\..\requirements\windows.txt" --recurse --binarysource=clear
+set VCPKG_DEFAULT_TRIPLET=x64-windows-meshrus
+
+for /f "delims=" %%i in ('where vcpkg') do set vcpkg_path=%%i
+if not exist %vcpkg_path%\..\downloads mkdir %vcpkg_path%\..\downloads
+copy "%~dp0vcpkg\downloads" %vcpkg_path%\..\downloads
+
+vcpkg install "@%~dp0\..\requirements\windows.txt" --recurse --binarysource=clear