From 682ca64fe073ff91fe6fd08deff6010a22ddc1e2 Mon Sep 17 00:00:00 2001 From: Moritz Maxeiner <mm@ucw.sh> Date: Tue, 10 Dec 2019 15:00:38 +0100 Subject: [PATCH] windows: Make cmake use vcpkg toolchain file by default --- windows1809/base/Dockerfile | 1 + windows1809/base/powershell/vcpkg-cmake.ps1 | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 windows1809/base/powershell/vcpkg-cmake.ps1 diff --git a/windows1809/base/Dockerfile b/windows1809/base/Dockerfile index becd9ca..8195a4b 100644 --- a/windows1809/base/Dockerfile +++ b/windows1809/base/Dockerfile @@ -47,3 +47,4 @@ RUN $vcpkg_dir = 'C:/vcpkg'; \ git checkout c05eb1ab83ddb9d4799fb9f3cd10bb385f05469b; \ ./scripts/bootstrap.ps1; \ [Environment]::SetEnvironmentVariable('VCPKG_DIR', "\"$vcpkg_dir\"", [EnvironmentVariableTarget]::Machine); +ADD powershell/vcpkg-cmake.ps1 /Windows/System32/WindowsPowerShell/v1.0/profile.d/vcpkg-cmake.ps1 diff --git a/windows1809/base/powershell/vcpkg-cmake.ps1 b/windows1809/base/powershell/vcpkg-cmake.ps1 new file mode 100644 index 0000000..de628e9 --- /dev/null +++ b/windows1809/base/powershell/vcpkg-cmake.ps1 @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: MIT + +# +# 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 -- GitLab