mirror of
https://github.com/KjellKod/g3log.git
synced 2025-03-02 20:30:12 +01:00
key-space issues, fixed1
This commit is contained in:
parent
aed15716ad
commit
10150e7633
32
.travis.yml
32
.travis.yml
@ -1,5 +1,6 @@
|
||||
language: cpp
|
||||
|
||||
sudo: false
|
||||
os:
|
||||
- linux
|
||||
|
||||
@ -21,26 +22,26 @@ before_install:
|
||||
|
||||
if [ ${TRAVIS_OS_NAME} = 'linux' ];
|
||||
then
|
||||
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test;
|
||||
sudo apt-get update -qq;
|
||||
sudo apt-get install python-software-properties;
|
||||
sudo apt-get update;
|
||||
sudo apt-get install gcc-5 g++-5;
|
||||
sudo apt-get install software-properties-common;
|
||||
add-apt-repository -y ppa:ubuntu-toolchain-r/test;
|
||||
apt-get update -qq;
|
||||
apt-get install python-software-properties;
|
||||
apt-get update;
|
||||
apt-get install gcc-5 g++-5;
|
||||
apt-get install software-properties-common;
|
||||
# sudo add-apt-repository -y ppa:george-edison55-precise-backports;
|
||||
sudo apt-get update;
|
||||
sudo apt-get update -qq;
|
||||
apt-get update;
|
||||
apt-get update -qq;
|
||||
#sudo apt-get install cmake cmake-data;
|
||||
fi
|
||||
|
||||
install:
|
||||
# gcc 5 .
|
||||
- if [ "$CXX" == "g++" ]; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 10; fi
|
||||
- if [ "$CXX" == "g++" ]; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 10; fi
|
||||
- if [ "$CXX" == "g++" ]; then update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 10; fi
|
||||
- if [ "$CXX" == "g++" ]; then update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 10; fi
|
||||
|
||||
# clang 3.4
|
||||
- if [ "$CXX" == "clang++" ]; then sudo apt-get install --allow-unauthenticated -qq clang-3.4; fi
|
||||
- if [ "$CXX" == "clang++" ]; then sudo apt-get install libc++1 libc++abi-dev || true; fi
|
||||
- if [ "$CXX" == "clang++" ]; then apt-get install --allow-unauthenticated -qq clang-3.4; fi
|
||||
- if [ "$CXX" == "clang++" ]; then apt-get install libc++1 libc++abi-dev || true; fi
|
||||
|
||||
- if [ "$CXX" == "clang++" ]; then export CXXFLAGS="-std=c++0x -stdlib=libc++"; fi
|
||||
- if [ "$CXX" == "clang++" ]; then svn co --quiet http://llvm.org/svn/llvm-project/libcxx/trunk libcxx; fi
|
||||
@ -61,9 +62,10 @@ script: "./scripts/buildAndRunTests.sh"
|
||||
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- cmake
|
||||
- cmake-data
|
||||
sources:
|
||||
- kalakris-cmake
|
||||
- george-edison55-precise-backports
|
||||
packages:
|
||||
- cmake
|
||||
- cmake-data
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user