diff --git a/.appveyor.yml b/.appveyor.yml index 281e1c4..bb2f5c5 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,11 +1,11 @@ -os: Visual Studio 2017 +os: Visual Studio 2022 environment: matrix: - arch: x86 - compiler: msvc2015 + compiler: msvc2019 - arch: x64 - compiler: msvc2017 + compiler: msvc2019 platform: - x64 @@ -15,8 +15,8 @@ install: - cmd: mkdir C:\ninja-build - ps: (new-object net.webclient).DownloadFile('https://github.com/mesonbuild/cidata/raw/master/ninja.exe', 'C:\ninja-build\ninja.exe') # Set paths to dependencies (based on architecture) - - cmd: if %arch%==x86 (set PYTHON_ROOT=C:\python37) else (set PYTHON_ROOT=C:\python37-x64) - - cmd: if %arch%==x86 (set QT_ROOT=C:\Qt\5.11\%compiler%) else (set QT_ROOT=C:\Qt\5.11\%compiler%_64) + - cmd: if %arch%==x86 (set PYTHON_ROOT=C:\python312) else (set PYTHON_ROOT=C:\python312-x64) + - cmd: if %arch%==x86 (set QT_ROOT=C:\Qt\5.15\%compiler%) else (set QT_ROOT=C:\Qt\5.15\%compiler%_64) # Print out dependency paths - cmd: echo Using Python at %PYTHON_ROOT% - cmd: echo Using Qt at %QT_ROOT% @@ -25,16 +25,12 @@ install: # Install meson - cmd: pip install meson # Set up the build environment - - cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) - - cmd: if %compiler%==msvc2017 ( call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %arch% ) + - cmd: if %compiler%==msvc2019 ( call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" %arch% ) build_script: - cmd: echo Building on %arch% with %compiler% - - cmd: meson --backend=ninja -Dbuildtype=release -Ddefault_library=static -Ddemo=true builddir - - cmd: ninja -C builddir - -test_script: - - cmd: ninja -C builddir test + - cmd: meson setup --backend=ninja -Dbuildtype=release -Ddefault_library=static -Ddemo=true builddir + - cmd: meson compile -C builddir after_build: # Zip build binaries and dependencies