From 166e276c20597e87f7b40906bcd2f5ec9677b8cf Mon Sep 17 00:00:00 2001
From: Ole Erik Peistorpet <oleerikp@gmail.com>
Date: Wed, 14 Oct 2020 00:03:11 +0200
Subject: [PATCH] Travis: ARM, g++ 10, Xcode 12.2

---
 .travis.yml              | 16 +++++++++++-----
 unit_test/CMakeLists.txt |  6 +++++-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4eb64168..b0181922 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,22 +12,28 @@ branches:
     - develop
     - /release/
 
-matrix:
+jobs:
   include:
     - os: linux
       dist: trusty
       env:
         - CXXFLAGS="-D OEL_MEM_BOUND_DEBUG_LVL=2" MY_BUILD_TYPE=Release
     - os: linux
+      arch:
+        - arm64
       env:
-        - CC="gcc-9" CXX="g++-9" CXXFLAGS="-D OEL_MEM_BOUND_DEBUG_LVL=2" MY_BUILD_TYPE=Release
+        - CXXFLAGS="-D OEL_MEM_BOUND_DEBUG_LVL=2" MY_BUILD_TYPE=Release
+    - os: linux
+      dist: bionic
+      env:
+        - CC=gcc-10 CXX=g++-10  MY_BUILD_TYPE=Release
       addons:
         apt:
           sources:
-            - ubuntu-toolchain-r-test
+            - sourceline: 'ppa:ubuntu-toolchain-r/test'
           packages:
-            - g++-9
+            - g++-10
     - os: osx
-      osx_image: xcode11.1
+      osx_image: xcode12.2
       env:
         - CXXFLAGS="-fsanitize=address -fsanitize=undefined -D OEL_MEM_BOUND_DEBUG_LVL=0" MY_BUILD_TYPE=""
diff --git a/unit_test/CMakeLists.txt b/unit_test/CMakeLists.txt
index 823a2a67..629987a0 100644
--- a/unit_test/CMakeLists.txt
+++ b/unit_test/CMakeLists.txt
@@ -2,7 +2,11 @@ cmake_minimum_required(VERSION 3.1)
 
 project(oel-test CXX)
 
-set(CMAKE_CXX_STANDARD 17)
+if(${CMAKE_VERSION} VERSION_GREATER "3.8.0")
+	set(CMAKE_CXX_STANDARD 17)
+else()
+	set(CMAKE_CXX_STANDARD 14)
+endif()
 set(CMAKE_CXX_EXTENSIONS OFF)