From 7986d36623958386788a1f4e8bcd33f52f7bf3fa Mon Sep 17 00:00:00 2001
From: armatusmiles <akurotych@gmail.com>
Date: Sat, 14 Jul 2018 03:10:17 +0300
Subject: [PATCH] Add gcc5 support to travis
---
.travis.yml | 10 ++++++++++
CMakeLists.txt | 3 +--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index c9a7d3c..2dc9f85 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,6 @@
+sudo: required
language: cpp
+compiler: gcc
dist: trusty
notifications:
email: false
@@ -11,9 +13,17 @@ before_install:
- source /opt/qt510/bin/qt510-env.sh
script:
+ - export CC=gcc-5
- mkdir build
- cd build
- cmake ../
- make libdap-test
- ./test/libdap-test
+addons:
+ apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ packages:
+ - gcc-5
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f2d12b..6690137 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,8 +4,7 @@ project(libdap C)
# fix implicit declaration warnings
add_definitions ("-D_GNU_SOURCE")
-set(CMAKE_C_FLAGS "-Wall -Wextra")
-set(CMAKE_C_FLAGS "-std=c11")
+set(CMAKE_C_FLAGS "-std=c11 -Wall -Wextra")
add_subdirectory(core)
add_subdirectory(crypto)
--
GitLab