diff --git a/.appveyor.yml b/.appveyor.yml index 9f7f719b..fd1c0f22 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,10 +1,10 @@ version: 7.9.0-{build} image: -- Visual Studio 2019 +- Visual Studio 2022 environment: - STUDIO_VERSION_EDITION: Studio\2019\Community + STUDIO_VERSION_EDITION: Studio\2022\Community PLATFORM_TYPE: CMAKE_CONFIG: Debug TEST_TARGET: check @@ -30,11 +30,9 @@ environment: - TARGET: nmake ARCH: x86 CFLAGS_EXTRA: -DNDEBUG - WINSDK_VERSION: 8.1 - TARGET: nmake ARCH: x64 CFLAGS_EXTRA: -DAO_CMPXCHG16B_AVAILABLE - WINSDK_VERSION: 8.1 - TARGET: nmake ARCH: x86_x64 CFLAGS_EXTRA: -DNDEBUG @@ -53,12 +51,12 @@ build_script: && cmake %CMAKE_OPTIONS% -Denable_werror=ON -DCFLAGS_EXTRA="%CFLAGS_EXTRA%" .. && cmake --build . --config %CMAKE_CONFIG% --verbose --parallel ) - cmd: if [%TARGET%]==[nmake] ( - "C:\Program Files (x86)\Microsoft Visual %STUDIO_VERSION_EDITION%\VC\Auxiliary\Build\vcvarsall.bat" %ARCH% %PLATFORM_TYPE% %WINSDK_VERSION% + "C:\Program Files\Microsoft Visual %STUDIO_VERSION_EDITION%\VC\Auxiliary\Build\vcvarsall.bat" %ARCH% %PLATFORM_TYPE% && cd src && nmake -f Makefile.msft clean all CFLAGS_EXTRA="/WX %CFLAGS_EXTRA%" && cd .. ) test_script: - cmd: if [%TARGET%]==[cmake] ( ctest --build-config %CMAKE_CONFIG% --verbose --parallel 4 ) - cmd: if [%TARGET%]==[nmake] ( - "C:\Program Files (x86)\Microsoft Visual %STUDIO_VERSION_EDITION%\VC\Auxiliary\Build\vcvarsall.bat" %ARCH% %PLATFORM_TYPE% %WINSDK_VERSION% + "C:\Program Files\Microsoft Visual %STUDIO_VERSION_EDITION%\VC\Auxiliary\Build\vcvarsall.bat" %ARCH% %PLATFORM_TYPE% && cd src && nmake -f Makefile.msft %TEST_TARGET% CFLAGS_EXTRA="/WX %CFLAGS_EXTRA%" )