From 4abe50538304d1a9aebeade6a1a9ee9bbde8b862 Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Fri, 22 Jul 2016 21:29:47 +0100 Subject: [PATCH] Build all targets on Travis --- .travis.yml | 15 +++++++++++++-- CMakeLists.txt | 3 ++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d5a3835a..a30fe59d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,14 @@ addons: - g++-5 - cmake - cmake-data + # GUI dependencies + - libx11-dev + - libgtk2.0-dev + - libnss3-dev + - libgconf2-dev + - libxss-dev + - libasound2-dev + - libxtst-dev sauce_connect: true cache: @@ -51,8 +59,11 @@ before_script: script: - if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then npm test; fi - - make tests && ./tests - - make api-tests && ./api-tests + # Travis will run all steps before failing, so no point in building only the + # tests first. + - make all + - ./tests + - ./api-tests before_deploy: # Build the metadata validator diff --git a/CMakeLists.txt b/CMakeLists.txt index ad703691..56c9f0f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -328,7 +328,8 @@ IF (CMAKE_COMPILER_IS_GNUCXX) set (LOOT_LIBS ssl curl z - crypto) + crypto + rt) set (LOOT_GUI_LIBS X11) IF (NOT MINGW)