From d7712e904465633272534504d89b786b21272fe0 Mon Sep 17 00:00:00 2001 From: Moritz Maxeiner <mm@ucw.sh> Date: Wed, 11 Dec 2019 14:00:26 +0100 Subject: [PATCH] windows: Fix vcpkg-cmake and add it to devel/cuda-devel images --- windows1809/base/powershell/30-vcpkg-cmake.ps1 | 11 ----------- windows1809/cuda-devel/Dockerfile | 1 + .../cuda-devel/powershell/30-vcpkg-cmake.ps1 | 15 +++++++++++++++ windows1809/devel/Dockerfile | 1 + windows1809/devel/powershell/30-vcpkg-cmake.ps1 | 15 +++++++++++++++ 5 files changed, 32 insertions(+), 11 deletions(-) delete mode 100644 windows1809/base/powershell/30-vcpkg-cmake.ps1 create mode 100644 windows1809/cuda-devel/powershell/30-vcpkg-cmake.ps1 create mode 100644 windows1809/devel/powershell/30-vcpkg-cmake.ps1 diff --git a/windows1809/base/powershell/30-vcpkg-cmake.ps1 b/windows1809/base/powershell/30-vcpkg-cmake.ps1 deleted file mode 100644 index 482c7e3..0000000 --- a/windows1809/base/powershell/30-vcpkg-cmake.ps1 +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later - -# -# Executes CMake with vcpkg toolchain file -# -function vcpkg-cmake { - Must-Run "Program Files/CMake/bin/cmake.exe" '-DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake' -} - -# Use vcpkg-cmake by default -Set-Alias -Name cmake -Value vcpkg-cmake diff --git a/windows1809/cuda-devel/Dockerfile b/windows1809/cuda-devel/Dockerfile index 3f92efc..5c7301f 100644 --- a/windows1809/cuda-devel/Dockerfile +++ b/windows1809/cuda-devel/Dockerfile @@ -43,3 +43,4 @@ RUN cd $env:VCPKG_DIR; \ Remove-Item -Force -Recurse ./downloads; \ Remove-Item -Force -Recurse ./buildtrees; \ Remove-Item -Force -Recurse ./packages; +ADD powershell/30-vcpkg-cmake.ps1 /Windows/System32/WindowsPowerShell/v1.0/profile.d/30-vcpkg-cmake.ps1 diff --git a/windows1809/cuda-devel/powershell/30-vcpkg-cmake.ps1 b/windows1809/cuda-devel/powershell/30-vcpkg-cmake.ps1 new file mode 100644 index 0000000..8dbdde1 --- /dev/null +++ b/windows1809/cuda-devel/powershell/30-vcpkg-cmake.ps1 @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: AGPL-3.0-or-later + +# +# Executes CMake with vcpkg toolchain file +# +function Vcpkg-CMake { + if ($args[0] -eq "--build") { + Must-Run "/Program Files/CMake/bin/cmake.exe" $args + } else { + Must-Run "/Program Files/CMake/bin/cmake.exe" '-DCMAKE_TOOLCHAIN_FILE=${venv:CMAKE_TOOLCHAIN_FILE}' "-DVCPKG_TARGET_TRIPLET=${env:VCPKG_TARGET_TRIPLET}" $args + } +} + +# Use vcpkg-cmake by default +Set-Alias -Name cmake -Value Vcpkg-CMake diff --git a/windows1809/devel/Dockerfile b/windows1809/devel/Dockerfile index 053b086..ce09213 100644 --- a/windows1809/devel/Dockerfile +++ b/windows1809/devel/Dockerfile @@ -32,3 +32,4 @@ RUN cd $env:VCPKG_DIR; \ Remove-Item -Force -Recurse ./downloads; \ Remove-Item -Force -Recurse ./buildtrees; \ Remove-Item -Force -Recurse ./packages; +ADD powershell/30-vcpkg-cmake.ps1 /Windows/System32/WindowsPowerShell/v1.0/profile.d/30-vcpkg-cmake.ps1 diff --git a/windows1809/devel/powershell/30-vcpkg-cmake.ps1 b/windows1809/devel/powershell/30-vcpkg-cmake.ps1 new file mode 100644 index 0000000..8dbdde1 --- /dev/null +++ b/windows1809/devel/powershell/30-vcpkg-cmake.ps1 @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: AGPL-3.0-or-later + +# +# Executes CMake with vcpkg toolchain file +# +function Vcpkg-CMake { + if ($args[0] -eq "--build") { + Must-Run "/Program Files/CMake/bin/cmake.exe" $args + } else { + Must-Run "/Program Files/CMake/bin/cmake.exe" '-DCMAKE_TOOLCHAIN_FILE=${venv:CMAKE_TOOLCHAIN_FILE}' "-DVCPKG_TARGET_TRIPLET=${env:VCPKG_TARGET_TRIPLET}" $args + } +} + +# Use vcpkg-cmake by default +Set-Alias -Name cmake -Value Vcpkg-CMake -- GitLab