From 2125293a3c8ac91b954ee3398d4f1e2c85e63296 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Fri, 1 May 2020 14:38:49 +1000 Subject: [PATCH] appveyor: use ninja to build and try to prevent deploying on PRs --- .appveyor/build.bat | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.appveyor/build.bat b/.appveyor/build.bat index 59eca0e85..8e2e80d70 100644 --- a/.appveyor/build.bat +++ b/.appveyor/build.bat @@ -34,10 +34,13 @@ REM Add Qt and FFmpeg directory to path set PATH=%PATH%;C:\Qt\5.13.2\msvc2017_64\bin;%APPVEYOR_BUILD_FOLDER%\%FFMPEG_VER%-dev REM Run cmake -cmake -G "NMake Makefiles" . -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo +cmake -G "Ninja" . -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -REM Build with JOM -C:\Qt\Tools\QtCreator\bin\jom.exe || exit /B 1 +REM Build with Ninja +ninja.exe || exit /B 1 + +REM If this is a pull request, no further packaging/deploying needs to be done +if "%APPVEYOR_PULL_REQUEST_NUMBER%" == "" goto end REM Start building package mkdir olive-editor