update ci
This commit is contained in:
parent
4fa2614c30
commit
b27bc04ca9
3 changed files with 20 additions and 14 deletions
|
@ -26,7 +26,7 @@ before_build:
|
||||||
- if exist build RMDIR /S /Q build
|
- if exist build RMDIR /S /Q build
|
||||||
- if not exist build mkdir build
|
- if not exist build mkdir build
|
||||||
- cd build
|
- cd build
|
||||||
- cmake .. -G "%GENERATOR%"
|
- cmake .. -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=${CONFIGURATION}
|
||||||
|
|
||||||
build_script:
|
build_script:
|
||||||
- cmake --build . --config %CONFIGURATION%
|
- cmake --build . --config %CONFIGURATION%
|
||||||
|
|
30
.travis.yml
30
.travis.yml
|
@ -13,6 +13,12 @@ matrix:
|
||||||
include:
|
include:
|
||||||
- os: linux
|
- os: linux
|
||||||
compiler: g++
|
compiler: g++
|
||||||
|
addons:
|
||||||
|
apt:
|
||||||
|
sources:
|
||||||
|
- ubuntu-toolchain-r-test
|
||||||
|
packages:
|
||||||
|
- g++-4.8
|
||||||
env:
|
env:
|
||||||
- CXX_COMPILER=g++-4.8 CC_COMPILER=gcc-4.8 CONFIGURATION=Debug
|
- CXX_COMPILER=g++-4.8 CC_COMPILER=gcc-4.8 CONFIGURATION=Debug
|
||||||
|
|
||||||
|
@ -159,73 +165,73 @@ matrix:
|
||||||
compiler: clang++
|
compiler: clang++
|
||||||
osx_image: xcode7.0
|
osx_image: xcode7.0
|
||||||
env:
|
env:
|
||||||
- CONFIGURATION=Debug
|
- CXX_COMPILER=clang++ CC_COMPILER=clang CONFIGURATION=Debug
|
||||||
|
|
||||||
- os: osx
|
- os: osx
|
||||||
compiler: clang++
|
compiler: clang++
|
||||||
osx_image: xcode7.1
|
osx_image: xcode7.1
|
||||||
env:
|
env:
|
||||||
- CONFIGURATION=Debug
|
- CXX_COMPILER=clang++ CC_COMPILER=clang CONFIGURATION=Debug
|
||||||
|
|
||||||
- os: osx
|
- os: osx
|
||||||
compiler: clang++
|
compiler: clang++
|
||||||
osx_image: xcode7.2
|
osx_image: xcode7.2
|
||||||
env:
|
env:
|
||||||
- CONFIGURATION=Debug
|
- CXX_COMPILER=clang++ CC_COMPILER=clang CONFIGURATION=Debug
|
||||||
|
|
||||||
- os: osx
|
- os: osx
|
||||||
compiler: clang++
|
compiler: clang++
|
||||||
osx_image: xcode7.3
|
osx_image: xcode7.3
|
||||||
env:
|
env:
|
||||||
- CONFIGURATION=Debug
|
- CXX_COMPILER=clang++ CC_COMPILER=clang CONFIGURATION=Debug
|
||||||
|
|
||||||
- os: osx
|
- os: osx
|
||||||
compiler: clang++
|
compiler: clang++
|
||||||
osx_image: xcode8.0
|
osx_image: xcode8.0
|
||||||
env:
|
env:
|
||||||
- CONFIGURATION=Debug
|
- CXX_COMPILER=clang++ CC_COMPILER=clang CONFIGURATION=Debug
|
||||||
|
|
||||||
- os: osx
|
- os: osx
|
||||||
compiler: clang++
|
compiler: clang++
|
||||||
osx_image: xcode8.1
|
osx_image: xcode8.1
|
||||||
env:
|
env:
|
||||||
- CONFIGURATION=Debug
|
- CXX_COMPILER=clang++ CC_COMPILER=clang CONFIGURATION=Debug
|
||||||
|
|
||||||
- os: osx
|
- os: osx
|
||||||
compiler: clang++
|
compiler: clang++
|
||||||
osx_image: xcode8.2
|
osx_image: xcode8.2
|
||||||
env:
|
env:
|
||||||
- CONFIGURATION=Debug
|
- CXX_COMPILER=clang++ CC_COMPILER=clang CONFIGURATION=Debug
|
||||||
|
|
||||||
- os: osx
|
- os: osx
|
||||||
compiler: clang++
|
compiler: clang++
|
||||||
osx_image: xcode8.3
|
osx_image: xcode8.3
|
||||||
env:
|
env:
|
||||||
- CONFIGURATION=Debug
|
- CXX_COMPILER=clang++ CC_COMPILER=clang CONFIGURATION=Debug
|
||||||
|
|
||||||
- os: osx
|
- os: osx
|
||||||
compiler: clang++
|
compiler: clang++
|
||||||
osx_image: xcode9.0
|
osx_image: xcode9.0
|
||||||
env:
|
env:
|
||||||
- CONFIGURATION=Debug
|
- CXX_COMPILER=clang++ CC_COMPILER=clang CONFIGURATION=Debug
|
||||||
|
|
||||||
- os: osx
|
- os: osx
|
||||||
compiler: clang++
|
compiler: clang++
|
||||||
osx_image: xcode9.1
|
osx_image: xcode9.1
|
||||||
env:
|
env:
|
||||||
- CONFIGURATION=Debug
|
- CXX_COMPILER=clang++ CC_COMPILER=clang CONFIGURATION=Debug
|
||||||
|
|
||||||
- os: osx
|
- os: osx
|
||||||
compiler: clang++
|
compiler: clang++
|
||||||
osx_image: xcode9.2
|
osx_image: xcode9.2
|
||||||
env:
|
env:
|
||||||
- CONFIGURATION=Debug
|
- CXX_COMPILER=clang++ CC_COMPILER=clang CONFIGURATION=Debug
|
||||||
|
|
||||||
- os: osx
|
- os: osx
|
||||||
compiler: clang++
|
compiler: clang++
|
||||||
osx_image: xcode9.3
|
osx_image: xcode9.3
|
||||||
env:
|
env:
|
||||||
- CONFIGURATION=Debug
|
- CXX_COMPILER=clang++ CC_COMPILER=clang CONFIGURATION=Debug
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- export CC=${CC_COMPILER}
|
- export CC=${CC_COMPILER}
|
||||||
|
|
|
@ -7,7 +7,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
set(CMAKE_CXX_EXTENSIONS OFF)
|
set(CMAKE_CXX_EXTENSIONS OFF)
|
||||||
|
|
||||||
if((CMAKE_CXX_COMPILER_ID MATCHES "GNU") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
|
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")
|
elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
|
||||||
add_compile_options(/W4)
|
add_compile_options(/W4)
|
||||||
check_cxx_compiler_flag(/permissive HAS_PERMISSIVE_FLAG)
|
check_cxx_compiler_flag(/permissive HAS_PERMISSIVE_FLAG)
|
||||||
|
|
Loading…
Reference in a new issue