From b27bc04ca9d0b7c70e2b488f35abcaf60d978de2 Mon Sep 17 00:00:00 2001
From: Neargye <neargye@gmail.com>
Date: Mon, 28 May 2018 16:57:38 +0500
Subject: [PATCH] update ci

---
 .appveyor.yml  |  2 +-
 .travis.yml    | 30 ++++++++++++++++++------------
 CMakeLists.txt |  2 +-
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 859bd78..8f4787e 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -26,7 +26,7 @@ before_build:
   - if exist build RMDIR /S /Q build
   - if not exist build mkdir build
   - cd build
-  - cmake .. -G "%GENERATOR%"
+  - cmake .. -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=${CONFIGURATION}
 
 build_script:
   - cmake --build . --config %CONFIGURATION%
diff --git a/.travis.yml b/.travis.yml
index 98d7644..1bad870 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,12 @@ matrix:
   include:
     - os: linux
       compiler: g++
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-4.8
       env:
         - CXX_COMPILER=g++-4.8 CC_COMPILER=gcc-4.8 CONFIGURATION=Debug
 
@@ -159,73 +165,73 @@ matrix:
       compiler: clang++
       osx_image: xcode7.0
       env:
-        - CONFIGURATION=Debug
+        - CXX_COMPILER=clang++ CC_COMPILER=clang CONFIGURATION=Debug
 
     - os: osx
       compiler: clang++
       osx_image: xcode7.1
       env:
-        - CONFIGURATION=Debug
+        - CXX_COMPILER=clang++ CC_COMPILER=clang CONFIGURATION=Debug
 
     - os: osx
       compiler: clang++
       osx_image: xcode7.2
       env:
-        - CONFIGURATION=Debug
+        - CXX_COMPILER=clang++ CC_COMPILER=clang CONFIGURATION=Debug
 
     - os: osx
       compiler: clang++
       osx_image: xcode7.3
       env:
-        - CONFIGURATION=Debug
+        - CXX_COMPILER=clang++ CC_COMPILER=clang CONFIGURATION=Debug
 
     - os: osx
       compiler: clang++
       osx_image: xcode8.0
       env:
-        - CONFIGURATION=Debug
+        - CXX_COMPILER=clang++ CC_COMPILER=clang CONFIGURATION=Debug
 
     - os: osx
       compiler: clang++
       osx_image: xcode8.1
       env:
-        - CONFIGURATION=Debug
+        - CXX_COMPILER=clang++ CC_COMPILER=clang CONFIGURATION=Debug
 
     - os: osx
       compiler: clang++
       osx_image: xcode8.2
       env:
-        - CONFIGURATION=Debug
+        - CXX_COMPILER=clang++ CC_COMPILER=clang CONFIGURATION=Debug
 
     - os: osx
       compiler: clang++
       osx_image: xcode8.3
       env:
-        - CONFIGURATION=Debug
+        - CXX_COMPILER=clang++ CC_COMPILER=clang CONFIGURATION=Debug
 
     - os: osx
       compiler: clang++
       osx_image: xcode9.0
       env:
-        - CONFIGURATION=Debug
+        - CXX_COMPILER=clang++ CC_COMPILER=clang CONFIGURATION=Debug
 
     - os: osx
       compiler: clang++
       osx_image: xcode9.1
       env:
-        - CONFIGURATION=Debug
+        - CXX_COMPILER=clang++ CC_COMPILER=clang CONFIGURATION=Debug
 
     - os: osx
       compiler: clang++
       osx_image: xcode9.2
       env:
-        - CONFIGURATION=Debug
+        - CXX_COMPILER=clang++ CC_COMPILER=clang CONFIGURATION=Debug
 
     - os: osx
       compiler: clang++
       osx_image: xcode9.3
       env:
-        - CONFIGURATION=Debug
+        - CXX_COMPILER=clang++ CC_COMPILER=clang CONFIGURATION=Debug
 
 install:
   - export CC=${CC_COMPILER}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1c9382..18371ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 if((CMAKE_CXX_COMPILER_ID MATCHES "GNU") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
-    add_compile_options(-Wall -Wextra -pedantic)
+    add_compile_options(-Wall -Wextra -pedantic-errors)
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
     add_compile_options(/W4)
     check_cxx_compiler_flag(/permissive HAS_PERMISSIVE_FLAG)