From dbc86333d3a53f868e24ea46f1a3b10a44150386 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Fri, 29 Aug 2014 14:40:32 +0200 Subject: [PATCH] update travis-ci to not pull in all of boost and trimmed unneeded cmake settings --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index e09fa46dc..b5c113af0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,11 +10,10 @@ before_install: - echo "yes" | sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse" - echo "yes" | sudo apt-add-repository ppa:openmw/openmw - sudo apt-get update -qq - - sudo apt-get install -qq libboost-all-dev libgtest-dev google-mock - - sudo apt-get install -qq libqt4-dev - - sudo apt-get install -qq libopenal-dev + - 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 libboost-wave-dev - sudo apt-get install -qq libavcodec-dev libavformat-dev libavutil-dev libswscale-dev - - sudo apt-get install -qq libbullet-dev libogre-1.9-dev libmygui-dev libsdl2-dev libunshield-dev + - sudo apt-get install -qq libbullet-dev libogre-1.9-dev libmygui-dev libsdl2-dev libunshield-dev libtinyxml-dev libopenal-dev libqt4-dev - sudo mkdir /usr/src/gtest/build - cd /usr/src/gtest/build - sudo cmake .. -DBUILD_SHARED_LIBS=1 @@ -25,7 +24,7 @@ before_script: - cd - - mkdir build - cd build - - cmake .. -DBUILD_WITH_CODE_COVERAGE=1 -DBUILD_UNITTESTS=1 -DBUILD_WITH_DPKG=1 + - cmake .. -DBUILD_WITH_CODE_COVERAGE=1 -DBUILD_UNITTESTS=1 -DCMAKE_INSTALL_PREFIX=/usr -DBINDIR=/usr/games -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DUSE_SYSTEM_TINYXML=TRUE script: - make -j4 after_script: