From 4f83432331b802f1e71c33f116b91d7b330750a7 Mon Sep 17 00:00:00 2001 From: Moritz Maxeiner <mm@ucw.sh> Date: Wed, 11 Dec 2019 13:23:50 +0100 Subject: [PATCH] windows: fix quoting --- windows1809/cuda-devel/Dockerfile | 2 +- windows1809/devel/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/windows1809/cuda-devel/Dockerfile b/windows1809/cuda-devel/Dockerfile index 37bcbba..3f92efc 100644 --- a/windows1809/cuda-devel/Dockerfile +++ b/windows1809/cuda-devel/Dockerfile @@ -37,7 +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('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 9cd0f57..053b086 100644 --- a/windows1809/devel/Dockerfile +++ b/windows1809/devel/Dockerfile @@ -26,7 +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('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