diff --git a/.appveyor.yml b/.appveyor.yml index acf9a5d5..12e56773 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -9,8 +9,8 @@ configuration: # Environment environment: NINJA_URL: https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip - QT32PATH: 'C:\Qt\5.9\msvc2015' - QT64PATH: 'C:\Qt\5.9\msvc2015_64' + QT32PATH: 'C:\Qt\5.10.1\msvc2015' + QT64PATH: 'C:\Qt\5.10.1\msvc2015_64' VSVARSALLPATH: 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat' matrix: # Build: qmake vs2015 x86 shared @@ -34,7 +34,7 @@ install: - cmd: set "PATH=%CD%;%PYTHON%;%PATH%" - cmd: call "%VSVARSALLPATH%" %ARCH% - cmd: if "%ARCH%" == "x64" ( set "PATH=%QT64PATH%\bin;%PATH%" ) else ( set "PATH=%QT32PATH%\bin;%PATH%" ) - - cmd: python -m pip install meson + - cmd: python -m pip install meson==0.48.2 - cmd: powershell -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; wget %NINJA_URL% -OutFile ninja.zip; Expand-Archive .\ninja.zip -DestinationPath ." # Artifacts - cmd: set "ARTIFACT_NAME=Cutter_%ARCH%" diff --git a/src/meson.build b/src/meson.build index 402aa4b3..790bcabb 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,7 +1,7 @@ project('Cutter', 'cpp', default_options: 'cpp_std=c++11', meson_version: '>=0.47.0') qt5_mod = import('qt5') -py3_exe = import('python3').find_python() +py3_exe = import('python').find_installation('python3') qt_modules = [] feature_define_args = []