|
@@ -26,7 +26,7 @@ before_script:
|
|
|
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y; fi
|
|
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y; fi
|
|
|
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository ppa:boost-latest/ppa -y; fi
|
|
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository ppa:boost-latest/ppa -y; fi
|
|
|
- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "clang++" ]]; then sudo add-apt-repository ppa:h-rayflood/llvm -y; fi
|
|
- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "clang++" ]]; then sudo add-apt-repository ppa:h-rayflood/llvm -y; fi
|
|
|
-- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "clang++" ]]; then sudo apt-get install --allow-unauthenticated -qq clang-3.4; fi
|
|
|
|
|
|
|
+- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "clang++" ]]; then sudo apt-get install --allow-unauthenticated -qq clang-3.5; fi
|
|
|
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update; fi
|
|
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update; fi
|
|
|
- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "clang++" ]]; then export CXX="clang++-3.4"; fi
|
|
- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "clang++" ]]; then export CXX="clang++-3.4"; fi
|
|
|
- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "clang++" ]]; then export CXX="clang++-3.4"; fi
|
|
- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "clang++" ]]; then export CXX="clang++-3.4"; fi
|
|
@@ -61,6 +61,7 @@ before_script:
|
|
|
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then sudo installer -pkg /Volumes/OgreSDK_v1-9-0/OgreSDK_v1-9-0.pkg -target /usr/local/; fi
|
|
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then sudo installer -pkg /Volumes/OgreSDK_v1-9-0/OgreSDK_v1-9-0.pkg -target /usr/local/; fi
|
|
|
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew outdated boost || brew upgrade boost; fi
|
|
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew outdated boost || brew upgrade boost; fi
|
|
|
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew scp boost || brew scp boost; fi
|
|
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew scp boost || brew scp boost; fi
|
|
|
|
|
+- $CXX --version
|
|
|
|
|
|
|
|
before_install:
|
|
before_install:
|
|
|
script:
|
|
script:
|