Commit graph

67 commits

Author SHA1 Message Date
Eugene Shalygin
fa770871e9 Refactor CMake build scripts
1. Use FeatureSummary module to show configuration results.

2. Invert option()/find_package() relationship: instead of
calling find_package(... REQUIRED) when option is set, rely on optional
find package call and PackageName_FOUND variable.

3. Refactor handling options that result in simple preprocessor defines
(actually copy the snippet from libtorrent) so that everything is done
in a single function call.

4. Populate target properties in order to get rid of
include_directories() calls.
2018-06-05 11:39:11 +02:00
sledgehammer999
4ba6334506
Update libtorrent bottle for Travis macOS 2018-04-22 22:42:23 +03:00
sledgehammer999
686fb701bf
Update libtorrent bottle for Travis. 2018-01-03 22:41:54 +02:00
sledgehammer999
467ba380b2
Travis: Update libtorrent bottle with boost 1.65+ fix. 2017-09-11 01:20:02 +03:00
Eugene Shalygin
c614c66535 Install required plugins into bundle
Install platform and svg plugins into bundle. Update dependencies in
Travis.
2017-07-14 17:42:02 +02:00
sledgehammer999
b3004ac28b
Various fixes for Travis, macOS and cmake. 2017-07-14 18:29:55 +03:00
sledgehammer999
c4b9063767
Drop use of custom qt bottle for Travis and homebrew.
Patch for macdeployqt is included in the official homebrew formula.
2017-07-14 18:29:54 +03:00
sledgehammer999
3d970399d4
Update Travis to use the new macOS packages for qt and libtorrent. 2017-07-08 21:15:50 +03:00
Eugene Shalygin
c2f9f57ef4 Travis: group apt packages 2017-06-01 10:14:09 +02:00
Eugene Shalygin
8c589b8579 travis: use GCC 6 in CMake builds
GCC 4.8.4 has a bug with system includes: it does not ignore warnings
for files from system include directories. This breaks our Travis builds
due to warnings in zlib.h.
2017-06-01 10:12:27 +02:00
Eugene Shalygin
3a87af7372 travis: Use Ninja in CMake builds
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.
2017-06-01 10:12:27 +02:00
sledgehammer999
0a5bb6685f Merge pull request #6654 from Chocobo1/persistence
Webui server fixes
2017-04-30 16:34:23 +03:00
Chocobo1
46ac5e0ee2 TravisCI: only allow coverity build job when build_system=qmake 2017-04-25 01:03:08 +08:00
Chocobo1
cfb07b3d5b TravisCI: Install latest zlib & cleanups
Remove trailing semicolon, seems that isn't needed now
Switch builds to container-based infrastructure
Move similar code blocks together
2017-04-20 22:26:35 +08:00
Eugene Shalygin
97d52668cc travis: fix CMake + OSX build
Brew changed installation dir for Qt, and we have to change it in our
workaround symlinks too.
2017-04-17 16:27:24 +02:00
Eugene Shalygin
c32cee8098 travis: remove redundant 'cd' command 2017-04-17 16:27:24 +02:00
Eugene Shalygin
7d19ee2e59 travis: add cmake build 2017-03-20 22:18:36 +01:00
Eugene Shalygin
8a106314ff travis: remove Qt4 leftover 2017-03-20 19:47:21 +01:00
Eugene Shalygin
17e6eba50a travis: use apt addon for libtorrent and Qt packages 2017-03-20 19:47:21 +01:00
sledgehammer999
c37ff51004
Some improvements in travis.yml for macOS. Closes #6089. 2017-03-08 00:50:11 +02:00
Eugene Shalygin
e64bb1de8c Drop Qt 4 support 2017-03-05 22:24:59 +01:00
Chocobo1
cae2f3059c Workaround thread_local not supported on OSX
Drop back to xcode7.3 on TravisCI
2017-03-04 20:37:48 +08:00
Chocobo1
7d2a393532 Enable thread_local support in TravisCI 2017-02-16 12:21:27 +08:00
Hiro Asari
7f7b63b172 Allow some Mac jobs to fail
Put `allow_failures` in the correct place.
2017-01-20 09:11:18 -05:00
sledgehammer999
33ada71e4b
Fix Travis macOS builds. 2017-01-12 02:40:44 +02:00
sledgehammer999
48c2901d09
Allow build failures for qt4 and osx for Travis. 2017-01-12 01:12:06 +02:00
sledgehammer999
ca937b72ef
Use custom qt5 bottle for homebrew (macOS) on Travis. 2017-01-12 00:59:28 +02:00
sledgehammer999
b971eb52ee Fix travis osx build. 2016-12-02 23:11:05 +02:00
Chocobo1
ba2dc69ff9 Fix URL 2016-11-30 13:22:51 +08:00
sledgehammer999
f2d8b8e319 Travis: Use custom libtorrent formula and bottle for OSX.
Caches libtorrent 1.0.10 built with c++11 enabled.
2016-11-13 22:50:28 +02:00
Chocobo1
8abb5fdf47 Remove redundant command 2016-11-10 14:10:44 +08:00
sledgehammer999
bfde2ce875 Small travis update for OSX. 2016-11-07 17:11:33 +02:00
sledgehammer999
05d226a103 Fix travis again.
I wish the homebrew guys didn't break it so often and the travis guys updated their images more frequently.
2016-09-12 02:29:40 +03:00
sledgehammer999
d3ece7417d Upgrade pkg-config travis-ci for OS X.
Fixes 'zlib not found` errors.
Details: https://github.com/Homebrew/brew/issues/563
2016-07-21 14:43:47 +03:00
Chocobo1
959676164b [TravisCI] lock-on to libtorrent-rasterbar 1.0.9 version 2016-07-01 21:23:30 +08:00
Chocobo1
926cbb18ea Re-enable cache for linux builds
Enable cache for OSX builds
2016-05-08 21:47:28 +08:00
Chocobo1
f89d7c2f67 Suppress warning on OSX builds 2016-05-04 12:44:36 +08:00
sledgehammer999
e3409228da Fix qt5 bundle on OSX. Closes #4014. 2016-04-12 23:19:02 +03:00
Chocobo1
09194f8e1b TravisCI: switch to Trusty image. Closes #4953.
Drop workaround for gcc-4.8
2016-03-21 00:24:30 +08:00
Chocobo1
fa92a10f15 Turn off warning on OSX builds: unused-local-typedefs
Reorder option list, sort by lt_branch then qt then gui
2015-12-10 21:11:20 +08:00
sledgehammer999
6e09028682 Switch to Qt5 by default. 2015-11-22 22:07:59 +02:00
sledgehammer999
50b9438fb6 Cleaner way to disable linux qt5 builds on Travis. 2015-10-09 06:01:14 +03:00
sledgehammer999
10e3009c46 Enable Qt5 compilation for OS X on Travis. 2015-10-07 21:29:16 +03:00
sledgehammer999
cc5a737836 Fix Coverity Scan builds. 2015-10-05 23:39:43 +03:00
Vladimir Golovnev (Glassez)
2a411987db Bump minimum supported version of gcc to 4.8. 2015-09-24 13:26:25 +03:00
Chocobo1
89be63da02 TravisCI: build on osx 2015-09-03 12:51:54 +08:00
sledgehammer999
81c6de48dc Don't use geoip for Travis CI. 2015-07-30 23:45:35 +03:00
Chocobo1
a8f0acecb7 Migrate TravisCI to container-based infrastructure, closes #3506. 2015-07-30 12:02:00 +08:00
Vladimir Golovnev (Glassez)
e72cc4eaf9 Drop libtorrent 0.16.x support. 2015-07-25 19:00:18 +03:00
sledgehammer999
f12b300298 Partially revert e675625d0d.
It causes problems with Travis CI builds because travis checks out the branch which might have newer commits and not find our particular commit.
2015-06-28 16:43:04 +03:00