d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-30 16:34:16 +00:00
Code Issues Projects Releases Wiki Activity

travis: Use Ninja in CMake builds

Browse Source 
make does not show compiler command line when -Werror triggers a
compilation error. Ninja does show complete command line in this case,
and the command line might be important for analysing a build error.

Additionally, final build log contains only lines for generated files
and files with compilation warnings, and is much shorter as such.
This commit is contained in:
Eugene Shalygin 2017-05-31 15:06:53 +02:00
parent ff80208534
commit 3a87af7372
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@ -73,6 +73,7 @@ addons:
# Qt 5.5.1 # Qt 5.5.1
- qt55base - qt55base
- qt55tools - qt55tools
- ninja-build
before_install: before_install:
# only allow specific build for coverity scan, others will stop # only allow specific build for coverity scan, others will stop
@ -143,7 +144,7 @@ install:
if [ "$build_system" = "cmake" ]; then if [ "$build_system" = "cmake" ]; then
brew unlink cmake brew unlink cmake
brew install cmake brew install cmake ninja
brew install qt5 brew install qt5
brew link --force qt5 brew link --force qt5
@ -175,7 +176,8 @@ script:
mkdir build mkdir build
cd build cd build
cmake -DGUI=${gui} -DCMAKE_INSTALL_PREFIX="$qbt_path" "$MY_CMAKE_OPENSSL_HINT" \ cmake -DGUI=${gui} -DCMAKE_INSTALL_PREFIX="$qbt_path" "$MY_CMAKE_OPENSSL_HINT" \
-G "Unix Makefiles" -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE .. -G "Ninja" -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE ..
BUILD_TOOL="ninja"
fi fi
if [ "$build_system" = "qmake" ]; then if [ "$build_system" = "qmake" ]; then
./bootstrap.sh && ./configure $qbtconf ./bootstrap.sh && ./configure $qbtconf
@ -184,8 +186,9 @@ script:
sed -i "" -e "s/^\(CXX.*&&\).*$/\1 $CXX/" src/Makefile sed -i "" -e "s/^\(CXX.*&&\).*$/\1 $CXX/" src/Makefile
sed -i "" -e 's/^\(CXXFLAGS.*\)$/\1 -Wno-unused-local-typedefs -Wno-inconsistent-missing-override/' src/Makefile sed -i "" -e 's/^\(CXXFLAGS.*\)$/\1 -Wno-unused-local-typedefs -Wno-inconsistent-missing-override/' src/Makefile
fi fi
BUILD_TOOL="make"
fi fi
- make && make install - $BUILD_TOOL && $BUILD_TOOL install
after_success: after_success:
- if [ "$gui" = true ]; then qbt_exe="qbittorrent" ; else qbt_exe="qbittorrent-nox" ; fi - if [ "$gui" = true ]; then qbt_exe="qbittorrent" ; else qbt_exe="qbittorrent-nox" ; fi