From f7b32fcecf7d05b0a19dde4e36c3b976ee1391b4 Mon Sep 17 00:00:00 2001 From: Snaipe Date: Thu, 30 Jul 2015 22:40:00 +0200 Subject: [PATCH] Switched to gcc 4.8 --- .travis.yml | 9 ++------- CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index bb6a894..a1bca84 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,24 +1,19 @@ language: c compiler: -- gcc-5 +- gcc sudo: false addons: apt: - sources: - - ubuntu-toolchain-r-test packages: - check - - gcc-5 - gettext - cmake before_install: - ".ci/install-libcsptr.sh" - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/lib - export CFLAGS="-g -O0" -- export GCOV=gcov-5 script: -- mkdir -p build && cd $_ && cmake -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=$HOME - .. && make && make -C samples test +- mkdir -p build && cd $_ && cmake -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=$HOME .. && make && make -C samples test after_success: - make coveralls after_failure: diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ca9a1b..1eb7db7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ set(GettextTranslate_GMO_BINARY) set(MODULE_DIR "${CMAKE_SOURCE_DIR}/.cmake/Modules") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${MODULE_DIR}) -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -g -std=gnu11") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -g -std=gnu99") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-no-undefined") # Setup coveralls