aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorPhoebe <20694052+PhoebeHui@users.noreply.github.com>2020-08-14 09:57:00 -0700
committerGitHub <noreply@github.com>2020-08-14 09:57:00 -0700
commitae898b2c9435080a2130ac9112aae229debb5265 (patch)
tree057f4c73a059276c58bf7ea82b9680ef1252c22b /scripts
parent04b0fe8f42ce694c80686a6c8116f99936038bf3 (diff)
downloadvcpkg-ae898b2c9435080a2130ac9112aae229debb5265.tar.gz
vcpkg-ae898b2c9435080a2130ac9112aae229debb5265.zip
[msys] Improve vcpkg_acquire_msys (#12866)
Diffstat (limited to 'scripts')
-rw-r--r--scripts/cmake/vcpkg_acquire_msys.cmake5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake
index a663459eb..c7d0e8d95 100644
--- a/scripts/cmake/vcpkg_acquire_msys.cmake
+++ b/scripts/cmake/vcpkg_acquire_msys.cmake
@@ -36,7 +36,8 @@
## * [libvpx](https://github.com/Microsoft/vcpkg/blob/master/ports/libvpx/portfile.cmake)
function(vcpkg_acquire_msys PATH_TO_ROOT_OUT)
- set(TOOLPATH ${DOWNLOADS}/tools/msys2)
+ set(TIMESTAMP 20200812)
+ set(TOOLPATH ${DOWNLOADS}/tools/msys2-${TIMESTAMP})
cmake_parse_arguments(_am "" "" "PACKAGES" ${ARGN})
if(NOT CMAKE_HOST_WIN32)
@@ -145,7 +146,7 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT)
endif()
if(_am_PACKAGES)
- message(STATUS "Acquiring MSYS Packages...")
+ message(STATUS "Acquiring MSYS Packages from ${TOOLPATH}...")
string(REPLACE ";" " " _am_PACKAGES "${_am_PACKAGES}")
set(_ENV_ORIGINAL $ENV{PATH})