ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

package/ci: use GCC 4.8 on Travis.

simd
Vladimír Vondruš 8 years ago
parent
3e3eb21181
commit
59665d2712
2 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      doc/building.dox
  2. 10
      package/ci/travis.yml

2
doc/building.dox
Unescape View File

@ -992,7 +992,7 @@ for Android.
@subsection building-ci-travis Travis @subsection building-ci-travis Travis
In `package/ci/` there is a `travis.yml` file with Linux GCC 4.7, macOS, Linux In `package/ci/` there is a `travis.yml` file with Linux GCC 4.8, macOS, Linux
desktop GLES2/GLES3, iOS GLES2/GLES3, Emscripten WebGL1/WebGL2, Android desktop GLES2/GLES3, iOS GLES2/GLES3, Emscripten WebGL1/WebGL2, Android
GLES2/GLES3, AddressSanitizer and ThreadSanitizer configuration. Online at GLES2/GLES3, AddressSanitizer and ThreadSanitizer configuration. Online at
https://travis-ci.org/mosra/magnum. https://travis-ci.org/mosra/magnum.

10
package/ci/travis.yml
Unescape View File

@ -4,7 +4,7 @@ addons:
apt: apt:
packages: packages:
- libgl1-mesa-dev - libgl1-mesa-dev
- g++-4.7 - g++-4.8
- ninja-build - ninja-build
- lcov - lcov
- "libc6:i386" # CMake 2.8.12 is 32bit - "libc6:i386" # CMake 2.8.12 is 32bit
@ -27,7 +27,7 @@ matrix:
- JOBID=linux-gl - JOBID=linux-gl
- TARGET=desktop - TARGET=desktop
- CMAKE_CXX_FLAGS="--coverage" - CMAKE_CXX_FLAGS="--coverage"
- LCOV_EXTRA_OPTS="--gcov-tool /usr/bin/gcov-4.7" - LCOV_EXTRA_OPTS="--gcov-tool /usr/bin/gcov-4.8"
- language: cpp - language: cpp
os: linux os: linux
dist: trusty dist: trusty
@ -81,7 +81,7 @@ matrix:
- TARGET=desktop-gles - TARGET=desktop-gles
- TARGET_GLES2=ON - TARGET_GLES2=ON
- CMAKE_CXX_FLAGS="--coverage" - CMAKE_CXX_FLAGS="--coverage"
- LCOV_EXTRA_OPTS="--gcov-tool /usr/bin/gcov-4.7" - LCOV_EXTRA_OPTS="--gcov-tool /usr/bin/gcov-4.8"
- language: cpp - language: cpp
os: linux os: linux
dist: trusty dist: trusty
@ -91,7 +91,7 @@ matrix:
- TARGET=desktop-gles - TARGET=desktop-gles
- TARGET_GLES2=OFF - TARGET_GLES2=OFF
- CMAKE_CXX_FLAGS="--coverage" - CMAKE_CXX_FLAGS="--coverage"
- LCOV_EXTRA_OPTS="--gcov-tool /usr/bin/gcov-4.7" - LCOV_EXTRA_OPTS="--gcov-tool /usr/bin/gcov-4.8"
- language: cpp - language: cpp
os: osx os: osx
# The new plugin testing workflow is dynamically loading and unloading them # The new plugin testing workflow is dynamically loading and unloading them
@ -183,7 +183,7 @@ cache:
- $HOME/cmake - $HOME/cmake
install: install:
- if [ "$TRAVIS_OS_NAME" == "linux" ] && [ ! "$TARGET" == "desktop-sanitizers" ] && [ ! "$TARGET" == "android" ] && [ ! "$TARGET" == "desktop-vulkan" ]; then export CXX=g++-4.7; fi - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ ! "$TARGET" == "desktop-sanitizers" ] && [ ! "$TARGET" == "android" ] && [ ! "$TARGET" == "desktop-vulkan" ]; then export CXX=g++-4.8; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$TARGET" == "desktop-sanitizers" ]; then export CXX=clang++-3.8; fi - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$TARGET" == "desktop-sanitizers" ]; then export CXX=clang++-3.8; fi
- if [ "$BUILD_DEPRECATED" != "OFF" ]; then export BUILD_DEPRECATED=ON; fi - if [ "$BUILD_DEPRECATED" != "OFF" ]; then export BUILD_DEPRECATED=ON; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$TARGET" == "desktop" ] && [ "$BUILD_DEPRECATED" == "ON" ]; then export WITH_GLUTAPPLICATION=ON; fi - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$TARGET" == "desktop" ] && [ "$BUILD_DEPRECATED" == "ON" ]; then export WITH_GLUTAPPLICATION=ON; fi

Write Preview
Loading…
Cancel
Save