we now have gcc-5 _and_ gcc-8, along with QT5 and use system tinyxml

pull/541/head
Bret Curtis 6 years ago
parent 68f62c974a
commit fc15fa0a89

@ -17,15 +17,15 @@ addons:
- llvm-toolchain-xenial-7
packages: [
# Dev
cmake, clang-7, clang-tools-7, gcc-5, g++-5,
cmake, clang-7, clang-tools-7, gcc-8, g++-8,
# Boost
libboost-filesystem-dev, libboost-program-options-dev, libboost-system-dev,
# FFmpeg
libavcodec-dev, libavformat-dev, libavutil-dev, libswscale-dev,
libavcodec-dev, libavformat-dev, libavutil-dev, libswresample-dev, libswscale-dev,
# Audio, Video and Misc. deps
libsdl2-dev, libqt4-dev, libopenal-dev, libunshield-dev, libtinyxml-dev,
libsdl2-dev, libqt5opengl5-dev, libopenal-dev, libunshield-dev, libtinyxml-dev,
# The other ones from OpenMW ppa
libbullet-dev, libswresample-dev, libopenscenegraph-3.4-dev, libmygui-dev
libbullet-dev, libopenscenegraph-3.4-dev, libmygui-dev
]
coverity_scan:
project:
@ -42,11 +42,16 @@ matrix:
osx_image: xcode9.4
if: branch != coverity_scan
- name: OpenMW (all) on Ubuntu Xenial GCC-5
os: linux
dist: xenial
sudo: required
if: branch != coverity_scan
- name: OpenMW (all) on Ubuntu Xenial GCC-8
os: linux
dist: xenial
sudo: required
env:
- MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
- MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
if: branch != coverity_scan
- name: OpenMW (openmw) on Ubuntu Xenial Clang-7 with Static Analysis
os: linux
@ -68,12 +73,10 @@ matrix:
- BUILD_OPENMW="OFF"
if: branch != coverity_scan
compiler: clang
- name: OpenMW Coverity Scan
- name: OpenMW Components Coverity Scan
os: linux
dist: xenial
sudo: required
env:
- MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
if: branch = coverity_scan
# allow_failures:
# - name: OpenMW (openmw) on Ubuntu Xenial Clang-7 with Static Analysis

@ -26,6 +26,8 @@ ${ANALYZE} cmake \
-DBUILD_MYGUI_PLUGIN=${BUILD_OPENMW_CS} \
-DBUILD_WITH_CODE_COVERAGE=${CODE_COVERAGE} \
-DBUILD_UNITTESTS=1 \
-DUSE_SYSTEM_TINYXML=1 \
-DDESIRED_QT_VERSION=5 \
-DCMAKE_INSTALL_PREFIX=/usr \
-DBINDIR=/usr/games \
-DCMAKE_BUILD_TYPE="None" \

Loading…
Cancel
Save