diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2018-01-09 16:37:11 +0200 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2018-01-10 20:53:10 +0200 |
| commit | 3762d7389928ce6db403b2e335f814158358289b (patch) | |
| tree | 6ff1ec02564d546d8adcdd23768c988875573775 | |
| parent | 1fdf738aac1af1344340014c0c222b992ffb3c51 (diff) | |
| download | qtlocation-mapboxgl-upstream/tmpsantos-qt_windows_ninja.tar.gz | |
[qt][build] Use ninja for compiling Qt for Windowsupstream/tmpsantos-qt_windows_ninja
Faster builds.
| -rw-r--r-- | appveyor.yml | 14 | ||||
| -rwxr-xr-x | platform/qt/ninja.exe | bin | 0 -> 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 Binary files differnew file mode 100755 index 0000000000..f86ef07382 --- /dev/null +++ b/platform/qt/ninja.exe |