mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-30 21:15:33 +00:00
fix travis 2
This commit is contained in:
parent
2567c35434
commit
b2f1bb06f2
2 changed files with 6 additions and 4 deletions
|
@ -50,9 +50,6 @@ matrix:
|
||||||
- os: linux
|
- os: linux
|
||||||
env:
|
env:
|
||||||
ANALYZE="scan-build-3.6 --use-cc clang-3.6 --use-c++ clang++-3.6 "
|
ANALYZE="scan-build-3.6 --use-cc clang-3.6 --use-c++ clang++-3.6 "
|
||||||
COMPILER_NAME=gcc
|
|
||||||
CXX=g++-6
|
|
||||||
CC=gcc-6
|
|
||||||
compiler: clang
|
compiler: clang
|
||||||
allow_failures:
|
allow_failures:
|
||||||
- env: ANALYZE="scan-build-3.6 --use-cc clang-3.6 --use-c++ clang++-3.6 "
|
- env: ANALYZE="scan-build-3.6 --use-cc clang-3.6 --use-c++ clang++-3.6 "
|
||||||
|
|
|
@ -6,5 +6,10 @@ cd build
|
||||||
export CODE_COVERAGE=1
|
export CODE_COVERAGE=1
|
||||||
export RAKNET_ROOT=~/RakNet
|
export RAKNET_ROOT=~/RakNet
|
||||||
export Terra_ROOT=~/terra-Linux-x86_64-332a506
|
export Terra_ROOT=~/terra-Linux-x86_64-332a506
|
||||||
if [ "${CC}" = "clang" ]; then export CODE_COVERAGE=0; fi
|
if [ "${CC}" = "clang" ]; then export CODE_COVERAGE=0;
|
||||||
|
else
|
||||||
|
export COMPILER_NAME=gcc
|
||||||
|
export CXX=g++-6
|
||||||
|
export CC=gcc-6
|
||||||
|
fi
|
||||||
${ANALYZE}cmake .. -DBUILD_WITH_CODE_COVERAGE=${CODE_COVERAGE} -DBUILD_BSATOOL=OFF -DBUILD_ESMTOOL=OFF -DBUILD_ESSIMPORTER=OFF -DBUILD_LAUNCHER=OFF -DBUILD_MWINIIMPORTER=OFF -DBUILD_MYGUI_PLUGIN=OFF -DBUILD_OPENCS=OFF -DBUILD_WIZARD=OFF -DBUILD_UNITTESTS=1 -DCMAKE_INSTALL_PREFIX=/usr -DBINDIR=/usr/games -DCMAKE_BUILD_TYPE="None" -DUSE_SYSTEM_TINYXML=TRUE -DRakNet_LIBRARY_RELEASE=~/RakNet/lib/libRakNetLibStatic.a -DRakNet_LIBRARY_DEBUG=~/RakNet/lib/libRakNetLibStatic.a
|
${ANALYZE}cmake .. -DBUILD_WITH_CODE_COVERAGE=${CODE_COVERAGE} -DBUILD_BSATOOL=OFF -DBUILD_ESMTOOL=OFF -DBUILD_ESSIMPORTER=OFF -DBUILD_LAUNCHER=OFF -DBUILD_MWINIIMPORTER=OFF -DBUILD_MYGUI_PLUGIN=OFF -DBUILD_OPENCS=OFF -DBUILD_WIZARD=OFF -DBUILD_UNITTESTS=1 -DCMAKE_INSTALL_PREFIX=/usr -DBINDIR=/usr/games -DCMAKE_BUILD_TYPE="None" -DUSE_SYSTEM_TINYXML=TRUE -DRakNet_LIBRARY_RELEASE=~/RakNet/lib/libRakNetLibStatic.a -DRakNet_LIBRARY_DEBUG=~/RakNet/lib/libRakNetLibStatic.a
|
||||||
|
|
Loading…
Reference in a new issue