From 1ef3e99c6eba09fd39b7b0f45bc65bf4de0bd5c0 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Wed, 3 Jun 2020 20:08:40 +0200
Subject: [PATCH] [windows] don't hardcoded cmake toolchain file path
---
windows-1809/cuda-devel/Dockerfile | 2 +-
windows-1809/devel/Dockerfile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/windows-1809/cuda-devel/Dockerfile b/windows-1809/cuda-devel/Dockerfile
index 3ed1074..320b679 100644
--- a/windows-1809/cuda-devel/Dockerfile
+++ b/windows-1809/cuda-devel/Dockerfile
@@ -39,7 +39,7 @@ RUN cd $env:VCPKG_DIR; \
"\"opencv4[cuda,ffmpeg,ximea,opengl,contrib,ipp,dnn]\"" \
"\"mxnet[cpp,opencv,cuda,cudnn]\""; \
[Environment]::SetEnvironmentVariable('VCPKG_TRIPLET', "\"$vcpkg_triplet\"", [EnvironmentVariableTarget]::Machine); \
- [Environment]::SetEnvironmentVariable('CMAKE_TOOLCHAIN_FILE', "\"/vcpkg/scripts/buildsystems/vcpkg.cmake\"", [EnvironmentVariableTarget]::Machine); \
+ [Environment]::SetEnvironmentVariable('CMAKE_TOOLCHAIN_FILE', "\"$env:VCPKG_DIR/scripts/buildsystems/vcpkg.cmake\"", [EnvironmentVariableTarget]::Machine); \
[Environment]::SetEnvironmentVariable('VCPKG_TARGET_TRIPLET', "\"$vcpkg_triplet\"", [EnvironmentVariableTarget]::Machine); \
[Environment]::SetEnvironmentVariable('VCPKG_INSTALL_DIR', "\"$env:VCPKG_DIR/installed/$vcpkg_triplet\"", [EnvironmentVariableTarget]::Machine); \
Remove-Item -Force -Recurse ./downloads; \
diff --git a/windows-1809/devel/Dockerfile b/windows-1809/devel/Dockerfile
index 075b2ee..f3d55a2 100644
--- a/windows-1809/devel/Dockerfile
+++ b/windows-1809/devel/Dockerfile
@@ -28,7 +28,7 @@ RUN cd $env:VCPKG_DIR; \
"\"opencv4[ffmpeg,ximea,opengl,contrib,ipp,dnn]\"" \
"\"mxnet[cpp,opencv]\""; \
[Environment]::SetEnvironmentVariable('VCPKG_TRIPLET', "\"$vcpkg_triplet\"", [EnvironmentVariableTarget]::Machine); \
- [Environment]::SetEnvironmentVariable('CMAKE_TOOLCHAIN_FILE', "\"/vcpkg/scripts/buildsystems/vcpkg.cmake\"", [EnvironmentVariableTarget]::Machine); \
+ [Environment]::SetEnvironmentVariable('CMAKE_TOOLCHAIN_FILE', "\"$env:VCPKG_DIR/scripts/buildsystems/vcpkg.cmake\"", [EnvironmentVariableTarget]::Machine); \
[Environment]::SetEnvironmentVariable('VCPKG_TARGET_TRIPLET', "\"$vcpkg_triplet\"", [EnvironmentVariableTarget]::Machine); \
[Environment]::SetEnvironmentVariable('VCPKG_INSTALL_DIR', "\"$env:VCPKG_DIR/installed/$vcpkg_triplet\"", [EnvironmentVariableTarget]::Machine); \
Remove-Item -Force -Recurse ./downloads; \
--
GitLab