diff --git a/appveyor.yml b/appveyor.yml index 5a416536d7..6737b09320 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -36,6 +36,10 @@ environment: GENERATOR: 'Visual Studio 12' SHARED: ON CONFIGURATION: Release + - TOOLSET: cmake_qt + GENERATOR: 'Visual Studio 14 2015 Win64' + SHARED: ON + CONFIGURATION: Release clone_depth: 50 diff --git a/build/tools/appveyor-test.bat b/build/tools/appveyor-test.bat index 3149c807eb..d9eb84dad4 100755 --- a/build/tools/appveyor-test.bat +++ b/build/tools/appveyor-test.bat @@ -42,10 +42,15 @@ echo --- Note: ignoring possible test failures under Cygwin echo. exit /b 0 +:cmake_qt +set CMAKE_TEST_REGEX="test_base" +goto :cmake + :cmake if "%CONFIGURATION%"=="" set CONFIGURATION=Release +if "%CMAKE_TEST_REGEX%"=="" set CMAKE_TEST_REGEX="test_[base|gui]" cd ..\build_cmake -ctest -V -C %CONFIGURATION% -R "test_[base|gui]" --output-on-failure --interactive-debug-mode 0 . +ctest -V -C %CONFIGURATION% -R %CMAKE_TEST_REGEX% --output-on-failure --interactive-debug-mode 0 . if %errorlevel% NEQ 0 goto :error goto :eof diff --git a/build/tools/appveyor.bat b/build/tools/appveyor.bat index c2bc21f345..17a14d0369 100644 --- a/build/tools/appveyor.bat +++ b/build/tools/appveyor.bat @@ -78,6 +78,12 @@ set SKIPTESTS=1 set CMAKE_NATIVE_FLAGS=-j3 goto cmake +:cmake_qt +set SKIPINSTALL=1 +set QT5DIR="C:\Qt\5.11\msvc2015_64" +set CMAKE_CONFIGURE_FLAGS=-DCMAKE_PREFIX_PATH=%QT5DIR% -DwxBUILD_TOOLKIT="qt" -DCMAKE_CXX_STANDARD=11 +goto cmake + :cmake echo --- Tools versions: cmake --version