Skip to content

Commit e30335c

Browse files
authored
cp missed vcpkg packages (#113)
* cp missed vcpkg packages * mv downloads copy to install.bat * Update install.bat
1 parent f031459 commit e30335c

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

docker/windowsDockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ RUN sudo vcpkg integrate install
5151
# Install vcpkg requirements
5252
WORKDIR "C:\\vcpkg"
5353
COPY ./thirdparty/vcpkg/triplets/x64-windows-meshrus.cmake ./triplets
54-
COPY ./thirdparty/vcpkg/downloads ./downloads
5554
RUN C:\\workspace\\MeshLib\\thirdparty\\install.bat && rmdir /s /q buildtrees downloads ports packages
5655

5756
WORKDIR "C:\\workspace"

thirdparty/install.bat

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1-
set VCPKG_DEFAULT_TRIPLET=x64-windows-meshrus
2-
vcpkg install "@%~dp0\..\requirements\windows.txt" --recurse --binarysource=clear
1+
set VCPKG_DEFAULT_TRIPLET=x64-windows-meshrus
2+
3+
for /f "delims=" %%i in ('where vcpkg') do set vcpkg_path=%%i
4+
if not exist %vcpkg_path%\..\downloads mkdir %vcpkg_path%\..\downloads
5+
copy "%~dp0vcpkg\downloads" %vcpkg_path%\..\downloads
6+
7+
vcpkg install "@%~dp0\..\requirements\windows.txt" --recurse --binarysource=clear

0 commit comments

Comments
 (0)