Fix conflict clang with ccache.
This commit is contained in:
parent
8e83f66572
commit
1cde0c7976
|
@ -5,7 +5,9 @@ matrix:
|
||||||
dist: trusty
|
dist: trusty
|
||||||
sudo: required
|
sudo: required
|
||||||
compiler: clang
|
compiler: clang
|
||||||
env: DEPLOY=false
|
env:
|
||||||
|
- DEPLOY=false
|
||||||
|
- CCACHE_CPP2=yes
|
||||||
cache:
|
cache:
|
||||||
- ccache
|
- ccache
|
||||||
directories:
|
directories:
|
||||||
|
@ -31,6 +33,8 @@ before_install:
|
||||||
sudo apt-get install -y libqt5xmlpatterns5;
|
sudo apt-get install -y libqt5xmlpatterns5;
|
||||||
sudo apt-get install -y xpdf;
|
sudo apt-get install -y xpdf;
|
||||||
sudo apt-get install -y xvfb;
|
sudo apt-get install -y xvfb;
|
||||||
|
wget https://launchpad.net/ubuntu/+archive/primary/+files/ccache_3.3.4-1_amd64.deb;
|
||||||
|
sudo dpkg -i ccache_3.3.4-1_amd64.deb;
|
||||||
else
|
else
|
||||||
brew update > /dev/null;
|
brew update > /dev/null;
|
||||||
brew install qt5;
|
brew install qt5;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user