aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2017-11-12 22:29:02 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2017-11-15 18:23:48 +0530
commitda654dd2b9ebb91a2202e7a841c4ae1c71ebf8ea (patch)
tree28015ca2574f90e726fbbc64c2c52ca92ea022f0
parentc4069a95c23209b243d84a8fc9c81cac480f7dbd (diff)
downloadmeson-da654dd2b9ebb91a2202e7a841c4ae1c71ebf8ea.zip
meson-da654dd2b9ebb91a2202e7a841c4ae1c71ebf8ea.tar.gz
meson-da654dd2b9ebb91a2202e7a841c4ae1c71ebf8ea.tar.bz2
appveyor.yml: Only download pkg-config for MSVC
-rw-r--r--.appveyor.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index 8643b39..22a5812 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -89,8 +89,8 @@ install:
# but they have a broken certificate (on Windows) and an HSTS policy that
# forces usage of HTTPS, so we mirror our own copy.
- ps: If($Env:compiler -eq 'msys2-mingw') {(new-object Net.WebClient).DownloadFile('https://nirbheek.in/files/meson/get-pip.py', 'C:\projects\meson\get-pip.py')}
- # pkg-config is needed for some msvc and cygwin tests
- - ps: If($Env:compiler -ne 'msys2-mingw') {(new-object net.webclient).DownloadFile('http://nirbheek.in/files/binaries/pkg-config/win32/pkg-config.exe', 'C:\projects\meson\pkg-config.exe')}
+ # pkg-config is needed for the pkg-config tests on msvc
+ - ps: If($Env:compiler.StartsWith('msvc')) {(new-object net.webclient).DownloadFile('http://nirbheek.in/files/binaries/pkg-config/win32/pkg-config.exe', 'C:\projects\meson\pkg-config.exe')}
- cmd: if %compiler%==msys2-mingw ( %PYTHON% "C:\projects\meson\get-pip.py" )
- cmd: if %compiler%==cygwin ( call ci\appveyor-install.bat )
- ps: |