Skip to content
Snippets Groups Projects
Commit 1ef3e99c authored by calrama's avatar calrama
Browse files

[windows] don't hardcoded cmake toolchain file path

parent 48474165
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
windows-1809/cuda-devel/Dockerfile
+ 1
− 1
View file @ 1ef3e99c
......@@ -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; \
......
windows-1809/devel/Dockerfile
+ 1
− 1
View file @ 1ef3e99c
......@@ -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; \
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment