generic-library/g3log
1
0
Fork 0
mirror of https://github.com/KjellKod/g3log.git synced 2024-12-13 10:42:56 +01:00
Code Issues Projects Releases Wiki Activity

moved compiler exports to build script

Browse Source
This commit is contained in:
KjellKod 2014-10-11 23:00:18 -06:00
parent e49b1dc15d
commit 497bd1deab
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@ -40,13 +40,8 @@ install:
- if [ "$CXX" == "clang++" ]; then cd /usr/lib && sudo ln -sf libc++.so.1.0 libc++.so; fi - if [ "$CXX" == "clang++" ]; then cd /usr/lib && sudo ln -sf libc++.so.1.0 libc++.so; fi
- if [ "$CXX" == "clang++" ]; then sudo ln -sf libc++.so.1.0 libc++.so.1 && cd $cwd; fi - if [ "$CXX" == "clang++" ]; then sudo ln -sf libc++.so.1.0 libc++.so.1 && cd $cwd; fi
- if [ "$CXX" == "clang++" ]; then export CXX="clang++-3.4"; fi - if [ "$CXX" == "clang++" ]; then export CXX="clang++-3.4"; fi
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew update; fi
script: "./scripts/buildAndRunTests.sh"
script:
- echo ${TRAVIS_OS_NAME};
- if [ ${TRAVIS_OS_NAME} = 'osx' ]; then brew update; fi
- if [ "$CXX" = "g++" ]; then export CXX=g++-4.8; fi
- if [ "$CXX" = "clang++" ]; then export CXX=clang++-3.4; fi
- ./scripts/buildAndRunTests.sh

10
scripts/buildAndRunTests.sh
View File

@ -3,11 +3,17 @@
set -ev set -ev
unzip -o 3rdParty/gtest/gtest-1.7.0.zip -d 3rdParty/gtest unzip -o 3rdParty/gtest/gtest-1.7.0.zip -d 3rdParty/gtest
mkdir build_travis
cd build_travis
if [ "$CXX" = "g++" ]; then export CXX=g++-4.8; fi
if [ "$CXX" = "clang++" ]; then export CXX=clang++-3.4; fi
echo $TRAVIS_OS_NAME echo $TRAVIS_OS_NAME
echo $CXX echo $CXX
mkdir build_travis
cd build_travis
if [ "$CXX" = "g++-4.8" ] if [ "$CXX" = "g++-4.8" ]
then then
echo "Testing with g++" echo "Testing with g++"