diff --git a/windows1809/base/powershell/30-vcpkg-cmake.ps1 b/windows1809/base/powershell/30-vcpkg-cmake.ps1 deleted file mode 100644 index 482c7e3f7d60750152d2ccf50de7ec4ece1763b6..0000000000000000000000000000000000000000 --- 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 3f92efc34eb578af550cd82461a1e42b8787c2d2..5c7301f9b4959797fc43dad196ef9604a5eb95b6 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 0000000000000000000000000000000000000000..8dbdde11d7c7af0d42ae2924cf5ea62e1ce6a058 --- /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 053b086799f543b516581af31696246b056ae9b1..ce09213d278dee5ee9f6061a2f5c22e8e972a2fc 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 0000000000000000000000000000000000000000..8dbdde11d7c7af0d42ae2924cf5ea62e1ce6a058 --- /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