Merge pull request #57 from katajakasa/travis-xenial

Use xenial distro for travis

2 files changed, 111 insertions, 30 deletions

diff --git a/.travis.yml b/.travis.yml
index 2dc6271..4944acd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,38 +1,116 @@
 language: c
 
-sudo: required
-dist: trusty
+dist: xenial
 
-compiler:
-  - gcc
+matrix:
+  include:
+    - os: linux
+      addons:
+        sonarcloud:
+          organization: "katajakasa-github"
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - sourceline: 'deb https://apt.kitware.com/ubuntu/ xenial main'
+              key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc'
+            - sourceline: 'ppa:jonathonf/ffmpeg-4'
+            - sourceline: 'ppa:litenstein/sdl2-xenial'
+          packages:
+            - gcc-8
+            - cmake
+            - cmake-data
+            - libass-dev
+            - libavcodec-dev
+            - libavformat-dev
+            - libswresample-dev
+            - libswscale-dev
+            - libavutil-dev
+            - libsdl2-dev
+      cache:
+        directories:
+          - '$HOME/.sonar/cache'
+      after_script:
+        - build-wrapper-linux-x86-64 --out-dir bw-output make
+        - sonar-scanner
+      env:
+        - MATRIX_EVAL="CC=gcc-8"
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - sourceline: 'deb https://apt.kitware.com/ubuntu/ xenial main'
+              key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc'
+            - sourceline: 'ppa:jonathonf/ffmpeg-4'
+            - sourceline: 'ppa:litenstein/sdl2-xenial'
+          packages:
+            - gcc-9
+            - cmake
+            - cmake-data
+            - libass-dev
+            - libavcodec-dev
+            - libavformat-dev
+            - libswresample-dev
+            - libswscale-dev
+            - libavutil-dev
+            - libsdl2-dev
+      env:
+        - MATRIX_EVAL="CC=gcc-9"
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-xenial-7
+            - sourceline: 'deb https://apt.kitware.com/ubuntu/ xenial main'
+              key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc'
+            - sourceline: 'ppa:jonathonf/ffmpeg-4'
+            - sourceline: 'ppa:litenstein/sdl2-xenial'
+          packages:
+            - clang-7
+            - cmake
+            - cmake-data
+            - libass-dev
+            - libavcodec-dev
+            - libavformat-dev
+            - libswresample-dev
+            - libswscale-dev
+            - libavutil-dev
+            - libsdl2-dev
+      env:
+        - MATRIX_EVAL="CC=clang-7"
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-xenial-8
+            - sourceline: 'deb https://apt.kitware.com/ubuntu/ xenial main'
+              key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc'
+            - sourceline: 'ppa:jonathonf/ffmpeg-4'
+            - sourceline: 'ppa:litenstein/sdl2-xenial'
+          packages:
+            - clang-8
+            - cmake
+            - cmake-data
+            - libass-dev
+            - libavcodec-dev
+            - libavformat-dev
+            - libswresample-dev
+            - libswscale-dev
+            - libavutil-dev
+            - libsdl2-dev
+      env:
+        - MATRIX_EVAL="CC=clang-8"
+
+before_install:
+    - eval "${MATRIX_EVAL}"
 
 script:
-  - wget https://www.libsdl.org/release/SDL2-2.0.8.tar.gz -O - | tar -xz
-  - cd SDL2-2.0.8 && CC=gcc-7 ./configure --prefix=/usr && make -j2 && sudo make install && cd ..
-  - cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_EXAMPLES=On -DUSE_DYNAMIC_LIBASS=On -DCMAKE_C_COMPILER=/usr/bin/gcc-7 . 
-  - build-wrapper-linux-x86-64 --out-dir bw-output make && sonar-scanner
+  - cd $TRAVIS_BUILD_DIR
+  - cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=On .
+  - make
+  - make clean
 
 notifications:
   email: false
-
-addons:
-  sonarcloud:
-    organization: "katajakasa-github"
-  apt:
-    sources:
-    - sourceline: 'ppa:ubuntu-toolchain-r/test'
-    - sourceline: 'ppa:george-edison55/cmake-3.x'
-    - sourceline: 'ppa:jonathonf/ffmpeg-3'
-    packages:
-    - cmake
-    - gcc-7
-    - libass-dev
-    - libavcodec-dev
-    - libavformat-dev
-    - libswresample-dev
-    - libswscale-dev
-    - libavutil-dev
-
-cache:
-  directories:
-    - '$HOME/.sonar/cache'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f048ee9..f44b30b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,6 +26,9 @@ option(USE_ASAN "Use AddressSanitizer" OFF)
 find_package(SDL2 REQUIRED)
 find_package(ffmpeg COMPONENTS avcodec avformat avutil swscale swresample)
 
+# Strip whitespace, this fixes compilation issues on travis with newer cmakes
+string(STRIP ${SDL2_LIBRARIES} SDL2_LIBRARIES)
+
 set(LIBRARIES
     ${SDL2_LIBRARIES}
     ${FFMPEG_LIBRARIES}