Merge branch 'master' into add_execution_bit_for_travis_yml

Author: scheibel

.travis.yml

@@ -1,39 +1,62 @@
-language: cpp
-
-sudo: required
-dist: trusty
-
-os:
-  - linux
-  - osx
-
-compiler:
-  - gcc
-  - clang
+language: c++
 
 env:
   global:
     - CMAKE_OPTIONS="-DOPTION_BUILD_EXAMPLES=On"
-  matrix:
-    - CMAKE_CONFIGURATION=release BUILD_DIR=build
-    - CMAKE_CONFIGURATION=debug BUILD_DIR=build-debug
 
 matrix:
-  exclude:
-  - os: osx
-    compiler: gcc
+  include:
+
+    - os: osx
+      osx_image: xcode9.1
+      env: CMAKE_CONFIGURATION=release BUILD_DIR=build
+
+    - os: osx
+      osx_image: xcode9.1
+      env: CMAKE_CONFIGURATION=debug BUILD_DIR=build-debug
+
+    - os: linux
+      compiler: clang
+      env: CMAKE_CONFIGURATION=release BUILD_DIR=build
+
+    - os: linux
+      compiler: clang
+      env: CMAKE_CONFIGURATION=debug BUILD_DIR=build-debug
+
+    - os: linux
+      compiler: gcc
+      env:
+        - CMAKE_CONFIGURATION=release BUILD_DIR=build
+        - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
+      addons:
+        apt:
+          sources:
+          - ubuntu-toolchain-r-test
+          packages:
+          - cmake
+          - g++-5
+
+    - os: linux
+      compiler: gcc
+      env:
+        - CMAKE_CONFIGURATION=debug BUILD_DIR=build-debug
+        - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
+      addons:
+        apt:
+          sources:
+          - ubuntu-toolchain-r-test
+          packages:
+          - cmake
+          - g++-5
 
-before_install:
-  - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get install -qq cmake qt5-default cppcheck clang-tidy-3.8; fi
-  - if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install qt5 cppcheck; fi
-  - chmod +x ./configure
 
 before_script:
+  - eval "${MATRIX_EVAL}"
+  - chmod +x ./configure
   - ./configure
-  - if [ $CMAKE_CONFIGURATION == release ]; then ./configure; fi
-  - if [ $CMAKE_CONFIGURATION == debug ]; then ./configure debug; fi
+  - ./configure $CMAKE_CONFIGURATION
 
 script:
   - cmake --build $BUILD_DIR
   - cmake --build $BUILD_DIR --target test
-  - cmake --build $BUILD_DIR --target check-all
+

appveyor.yml

@@ -31,22 +31,19 @@ init:
 - echo %generator%
 
 before_build:
-- cmd: >-
+- cmd: |-
     mkdir build
-    
     cd build
-    
     cmake --version
-
     cmake .. -G %generator%
-    
+
 build:
   project: c:\projects\cmake-init\build\template.sln
   verbosity: minimal
-  parallel: true 
+  parallel: true
 only_commits:
   files:
     - CMakeLists.txt
     - appveyor.yml
-    - sources/
+    - source/
     - cmake/

cmake/Findclang_tidy.cmake

@@ -13,6 +13,7 @@ find_program(clang_tidy_EXECUTABLE
         clang-tidy-3.8
         clang-tidy-3.9
         clang-tidy-4.0
+        clang-tidy
     PATHS
         "${CLANG_TIDY_DIR}"
 )