From 0213039ee7e91fedeacad73ca28ce90a3084d018 Mon Sep 17 00:00:00 2001
From: Jason Turner <jason@emptycrate.com>
Date: Tue, 25 Mar 2014 08:12:07 -0600
Subject: [PATCH] Install gcc-4.8 in travis matrix and test both 4.6 & 4.8

---
 .travis.yml    | 11 +++++++++--
 CMakeLists.txt |  4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a9edd4a..e77769f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,22 @@
 language: cpp
 compiler:
   - gcc
+env:
+  - GCC_VER=4.6
+  - GCC_VER=4.8
 before_install:
-    - sudo pip install cpp-coveralls
+  - sudo pip install cpp-coveralls
+  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+  - sudo apt-get update
+  - sudo apt-get install -qq g++-4.8
+  - if [ "$GCC_VER" = "4.8" ]; then export CXX="g++-4.8" CC="gcc-4.8" GCOV="gcov-4.8";  export CXX="g++-4.6" CC="gcc-4.6" GCOV="gcov-4.6"; else  fi
 script: 
   - cmake -D ENABLE_COVERAGE:BOOL=TRUE -D CMAKE_BUILD_TYPE:STRING=Debug .
   - make -j2
   - make test
   - mkdir gcov
   - find CMakeFiles/ -name "*.gc*" -exec mv {} gcov/ \;
-  - gcov -d -o gcov gcov/*.gcda
+  - $GCOV -d -o gcov gcov/*.gcda
   - coveralls -n -E ".*\.cpp"
 notifications:
   recipients:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6626fc0..54e95fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,8 +88,8 @@ if (CMAKE_COMPILER_IS_GNUCC)
   endif()
 
   if (ENABLE_COVERAGE)
-    add_definitions(-fprofile-arcs -ftest-coverage)
-    SET(EXTRA_LINKER_FLAGS ${EXTRA_LINKER_FLAGS} "-fprofile-arcs -ftest-coverage")
+    add_definitions(--coverage -O0)
+    SET(EXTRA_LINKER_FLAGS ${EXTRA_LINKER_FLAGS} "--coverage")
     #    SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "-fprofile-arcs -ftest-coverage")
   endif()