From d9753bed0902836c2a782f6f97926d74aa173b48 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Wed, 11 Dec 2019 12:09:32 +0100
Subject: [PATCH] windows: Add CMAKE_TOOLCHAIN_FILE
---
windows1809/cuda-devel/Dockerfile | 1 +
windows1809/devel/Dockerfile | 1 +
2 files changed, 2 insertions(+)
diff --git a/windows1809/cuda-devel/Dockerfile b/windows1809/cuda-devel/Dockerfile
index a9707a4..37bcbba 100644
--- a/windows1809/cuda-devel/Dockerfile
+++ b/windows1809/cuda-devel/Dockerfile
@@ -37,6 +37,7 @@ RUN cd $env:VCPKG_DIR; \
"\"opencv3[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('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/windows1809/devel/Dockerfile b/windows1809/devel/Dockerfile
index de72000..9cd0f57 100644
--- a/windows1809/devel/Dockerfile
+++ b/windows1809/devel/Dockerfile
@@ -26,6 +26,7 @@ RUN cd $env:VCPKG_DIR; \
"\"opencv3[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('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