Skip to content

Commit

Permalink
Added various c++ version tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Mathieu Champlon committed Mar 22, 2018
1 parent 65c8584 commit 208e7e1
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ sudo: required
language: cpp

env:
- CXX_STANDARD=98
- CXX_STANDARD=11
- CXX_STANDARD=14
- CXX_STANDARD=17
Expand All @@ -13,7 +12,11 @@ compiler:
- clang

before_install:
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
- sudo apt-get -qq update
- sudo apt-get install gcc-5 g++-5
- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 60 --slave /usr/bin/g++ g++ /usr/bin/g++-5
- gcc --version
- sudo apt-get install cmake libboost-all-dev libxerces-c-dev libxalan-c-dev
- cmake --version
- travis_retry wget https://github.com/mat007/turtle/archive/master.zip
Expand Down
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
cmake_minimum_required(VERSION 2.8)
project(xeumeuleu)
set(CMAKE_CXX_STANDARD 11)
if(!CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 11)
endif()
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
enable_testing()
Expand Down
9 changes: 8 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,15 @@ environment:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
BOOST: 1_59_0
MSVC: 14
CXX_STANDARD: 11
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
BOOST: 1_64_0
MSVC: 15
CXX_STANDARD: 14
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
BOOST: 1_65_1
MSVC: 15
CXX_STANDARD: 17

platform:
- x86
Expand All @@ -30,6 +36,7 @@ init:
- set VCPKG_INCLUDEDIR=c:\tools\vcpkg\installed\%PLATFORM%-windows\include

install:
- cmake --version
- appveyor-retry vcpkg install xerces-c:%PLATFORM%-windows xalan-c:%PLATFORM%-windows
- appveyor-retry appveyor DownloadFile https://github.com/mat007/turtle/archive/master.zip -FileName turtle-master.zip
- 7z x turtle-master.zip
Expand All @@ -38,6 +45,6 @@ install:
build_script:
- mkdir %APPVEYOR_BUILD_FOLDER%\build\cmake
- cd %APPVEYOR_BUILD_FOLDER%\build\cmake
- cmake ../.. -G "%CMAKE_GENERATOR_NAME%" -DCMAKE_INCLUDE_PATH=%VCPKG_INCLUDEDIR% -DCMAKE_LIBRARY_PATH=%VCPKG_LIBRARYDIR% -DBoost_USE_STATIC_LIBS=ON
- cmake ../.. -G "%CMAKE_GENERATOR_NAME%" -DCMAKE_CXX_STANDARD=%CXX_STANDARD% -DCMAKE_INCLUDE_PATH=%VCPKG_INCLUDEDIR% -DCMAKE_LIBRARY_PATH=%VCPKG_LIBRARYDIR% -DBoost_USE_STATIC_LIBS=ON
- cmake --build . --config %CONFIGURATION%
- ctest -C %CONFIGURATION% --verbose

0 comments on commit 208e7e1

Please sign in to comment.