From a6cc86d6da8388312fe2c193afa2917bb9cf9379 Mon Sep 17 00:00:00 2001 From: David Korth Date: Fri, 30 May 2025 21:01:53 -0400 Subject: [PATCH] appveyor.cmd: Switch to MSVC 2015 and Qt 5.13. MSVC 2013 doesn't like the updated Google Test: extlib\googletest\googletest\include\gtest/internal/gtest-port.h(2102): error C3409: empty attribute block is not allowed Also, Qt 5.8 isn't present on AppVeyor anymore. Use Qt 5.13, which is available for MSVC 2015. --- appveyor.cmd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/appveyor.cmd b/appveyor.cmd index c8d7115..29a2b0b 100644 --- a/appveyor.cmd +++ b/appveyor.cmd @@ -2,20 +2,20 @@ cmake --version :: FIXME: Restore MinGW-w64 support? -set compiler=msvc2013 +set compiler=msvc2015 -if "%compiler%" == "msvc2013" goto :msvc2013 +if "%compiler%" == "msvc2015" goto :msvc2015 if "%compiler%" == "mingw-w64" goto :mingw-w64 echo *** ERROR: Unsupported compiler '%compiler%'. exit /b 1 -:msvc2013 +:msvc2015 set PreferredToolArchitecture=x64 -set "CMAKE_GENERATOR=Visual Studio 12 2013" -set CMAKE_GENERATOR_TOOLSET=v120_xp +set "CMAKE_GENERATOR=Visual Studio 14 2015" +set CMAKE_GENERATOR_TOOLSET=v140_xp if "%platform%" == "x64" set "CMAKE_GENERATOR=%CMAKE_GENERATOR% Win64" -if "%platform%" == "x86" set Qt5_DIR=C:\Qt\5.8\msvc2013\lib\cmake\Qt5 -if "%platform%" == "x64" set Qt5_DIR=C:\Qt\5.8\msvc2013_64\lib\cmake\Qt5 +if "%platform%" == "x86" set Qt5_DIR=C:\Qt\5.13\msvc2015\lib\cmake\Qt5 +if "%platform%" == "x64" set Qt5_DIR=C:\Qt\5.13\msvc2015_64\lib\cmake\Qt5 mkdir build cd build cmake .. -G "%CMAKE_GENERATOR%" -DCMAKE_GENERATOR_TOOLSET=%CMAKE_GENERATOR_TOOLSET% -DBUILD_TESTING=ON -DQt5_DIR=%Qt5_DIR%