From 30053140a108dd31204efeddbc8401f12a26c238 Mon Sep 17 00:00:00 2001 From: scrawl Date: Thu, 4 Jun 2015 16:55:14 +0200 Subject: [PATCH] Add cmake-data workaround to travis script --- .travis.yml | 12 ++++++------ CI/before_install.linux.sh | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7b5155137..d2b2ad079 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,9 +49,9 @@ notifications: email: on_success: change on_failure: always - irc: - channels: - - "chat.freenode.net#openmw" - on_success: change - on_failure: always - use_notice: true + #irc: + # channels: + # - "chat.freenode.net#openmw" + # on_success: change + # on_failure: always + # use_notice: true diff --git a/CI/before_install.linux.sh b/CI/before_install.linux.sh index 5823825ae..2408a5822 100755 --- a/CI/before_install.linux.sh +++ b/CI/before_install.linux.sh @@ -15,6 +15,7 @@ sudo apt-get install -qq libgtest-dev google-mock sudo apt-get install -qq libboost-filesystem-dev libboost-program-options-dev libboost-system-dev libboost-thread-dev sudo apt-get install -qq libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libavresample-dev sudo apt-get install -qq libbullet-dev libopenscenegraph-dev libmygui-dev libsdl2-dev libunshield-dev libtinyxml-dev libopenal-dev libqt4-dev +sudo apt-get install -qq cmake-data #workaround for broken osgqt cmake script in ubuntu 12.04 if [ "${ANALYZE}" ]; then sudo apt-get install -qq clang-3.6; fi sudo mkdir /usr/src/gtest/build cd /usr/src/gtest/build