summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2018-01-09 16:37:11 +0200
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2018-01-10 21:42:20 +0200
commitecbb0baf60138cea2c72ec4e75b788ca59d86e14 (patch)
tree22564da6186933de1967a87a5019c2d29d062f6c
parentc5be54bf43aca927706884f86406afe0aace7771 (diff)
downloadqtlocation-mapboxgl-ecbb0baf60138cea2c72ec4e75b788ca59d86e14.tar.gz
[qt][build] Use ninja for compiling Qt for Windows
Faster builds.
-rw-r--r--appveyor.yml14
-rwxr-xr-xplatform/qt/ninja.exebin0 -> 504320 bytes
2 files changed, 9 insertions, 5 deletions
diff --git a/appveyor.yml b/appveyor.yml
index fa5b08bcf9..8013c669f6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -31,21 +31,25 @@ install:
Start-Process -FilePath '7z' -ArgumentList 'x','cmake-3.10.1-win64-x64.zip','-oC:\' -Wait
before_build:
- - set PATH=C:\LLVM-5.0.1\msbuild-bin;%PATH%
+ - set PATH=C:\LLVM-5.0.1\bin;%PATH%
- set PATH=C:\cmake-3.10.1-win64-x64\bin;%PATH%
- - set QT_CMAKE=C:\Qt\5.7\msvc2015_64\lib\cmake
+ - set CC=clang-cl
+ - set CXX=clang-cl
- mkdir %APPVEYOR_BUILD_FOLDER%\build
- cd %APPVEYOR_BUILD_FOLDER%\build
build_script:
- - cmake -G "Visual Studio 14 2015 Win64" -T LLVM-vs2014 -DMBGL_PLATFORM=qt -DWITH_QT_DECODERS=ON -DWITH_QT_I18N=ON -DWITH_NODEJS=OFF -DCMAKE_PREFIX_PATH=%QT_CMAKE% %APPVEYOR_BUILD_FOLDER% & exit 0
- - cmake --build . --config Release --target qmapboxgl -- /m
+ - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+ - cmake -G "Ninja" -DMBGL_PLATFORM=qt -DWITH_QT_DECODERS=ON -DWITH_QT_I18N=ON -DWITH_NODEJS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=C:\Qt\5.7\msvc2015_64\lib\cmake -DCMAKE_MAKE_PROGRAM="%APPVEYOR_BUILD_FOLDER%\platform\qt\ninja.exe" ..
+ - cmake --build . -- -j %NUMBER_OF_PROCESSORS%
after_build:
- mkdir qmapboxgl
- mkdir qmapboxgl\lib
- mkdir qmapboxgl\include
- - copy Release\qmapboxgl.* qmapboxgl\lib
+ - copy qmapboxgl.dll qmapboxgl\lib
+ - copy qmapboxgl.exp qmapboxgl\lib
+ - copy qmapboxgl.lib qmapboxgl\lib
- copy %APPVEYOR_BUILD_FOLDER%\platform\qt\include\* qmapboxgl\include
- 7z a qmapboxgl-%APPVEYOR_REPO_COMMIT%.zip qmapboxgl
diff --git a/platform/qt/ninja.exe b/platform/qt/ninja.exe
new file mode 100755
index 0000000000..f86ef07382
--- /dev/null
+++ b/platform/qt/ninja.exe
Binary files differ