Permalink
Browse files

Merge commit '3c0cd4280e4f962cdc7fd7055fbbf31322e4cb21' into fpargs

  • Loading branch information...
unknownbrackets committed Jun 17, 2018
2 parents 045099f + 3c0cd42 commit c665c218163797fabdf0760df0e6b222d5f59769
@@ -0,0 +1,196 @@
language: cpp
sudo: false
# C'mon Travis, you're a great service, but why do I need a script to generate my build matrix?
# cat $0 | sed -e 's/^\(.\)/# \1/' -e 's/^$/#/'
#
# cat <<EOF
# matrix:
# include:
#
# EOF
#
#
# for os in linux ; do
# for compiler in g++-5 clang++-3.8 ; do
# for buildtype in Release Debug ; do
# for std in c++98 c++11 ; do
# cat <<EOF
# - os: $os
# compiler: $compiler
# env:
# - CXX_STD=$std
# - COMPILER=$compiler
# - BUILD_TYPE=$buildtype
# EOF
# if [[ $os == linux ]] ; then
# cat <<EOF
# addons:
# apt:
# sources:
# - ubuntu-toolchain-r-test
# - llvm-toolchain-precise-3.8
# packages:
# - $compiler
# EOF
# fi
# echo
# done
# done
# done
# done
matrix:
include:
- os: linux
compiler: g++-5
env:
- CXX_STD=c++98
- COMPILER=g++-5
- BUILD_TYPE=Release
addons:
apt:
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.8
packages:
- g++-5
- os: linux
compiler: g++-5
env:
- CXX_STD=c++11
- COMPILER=g++-5
- BUILD_TYPE=Release
addons:
apt:
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.8
packages:
- g++-5
- os: linux
compiler: g++-5
env:
- CXX_STD=c++98
- COMPILER=g++-5
- BUILD_TYPE=Debug
addons:
apt:
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.8
packages:
- g++-5
- os: linux
compiler: g++-5
env:
- CXX_STD=c++11
- COMPILER=g++-5
- BUILD_TYPE=Debug
addons:
apt:
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.8
packages:
- g++-5
- os: linux
compiler: clang++-3.8
env:
- CXX_STD=c++98
- COMPILER=clang++-3.8
- BUILD_TYPE=Release
addons:
apt:
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.8
packages:
- clang++-3.8
- os: linux
compiler: clang++-3.8
env:
- CXX_STD=c++11
- COMPILER=clang++-3.8
- BUILD_TYPE=Release
addons:
apt:
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.8
packages:
- clang++-3.8
- os: linux
compiler: clang++-3.8
env:
- CXX_STD=c++98
- COMPILER=clang++-3.8
- BUILD_TYPE=Debug
addons:
apt:
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.8
packages:
- clang++-3.8
- os: linux
compiler: clang++-3.8
env:
- CXX_STD=c++11
- COMPILER=clang++-3.8
- BUILD_TYPE=Debug
addons:
apt:
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.8
packages:
- clang++-3.8
- os: osx
compiler: clang
env:
- CXX_STD=c++98
- COMPILER=clang++
- BUILD_TYPE=Release
- os: osx
compiler: clang
env:
- CXX_STD=c++11
- COMPILER=clang++
- BUILD_TYPE=Release
- os: osx
compiler: clang
env:
- CXX_STD=c++98
- COMPILER=clang++
- BUILD_TYPE=Debug
- os: osx
compiler: clang
env:
- CXX_STD=c++11
- COMPILER=clang++
- BUILD_TYPE=Debug
before_script:
- cmake --version
script:
- mkdir build
- cd build
- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCXX_STD=$CXX_STD ..
- make testall
@@ -0,0 +1,41 @@
# CMake build for tests.
#
# See also the Makefile, which is currently more fully featured on unix.
# Set cmake builtin variables before calling project(), otherwise the
# cmake-provided defaults will get in first!
set(CMAKE_BUILD_TYPE "Release" CACHE STRING
"Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel."
)
set(CXX_STD "c++11" CACHE STRING "Version of C++ standard in use")
# This project is infrastructure. Warnings from common warning levels should
# be errors on all compilers, unless explicitly silenced.
if(NOT WIN32)
set(CMAKE_CXX_FLAGS "-Wall -Werror -std=${CXX_STD}" CACHE STRING "Flags used by the compiler during all build types.")
endif()
project(tinyformat)
cmake_minimum_required(VERSION 2.8)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
if(WIN32)
# Treat warnings as errors. Would set this above, but need the default
# flags too, and `project()` behaves is differently on different systems.
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /WX")
endif()
add_executable(tinyformat_test tinyformat_test.cpp)
enable_testing()
if(CMAKE_CONFIGURATION_TYPES)
set(ctest_config_opt -C ${CMAKE_BUILD_TYPE})
endif()
add_test(NAME test COMMAND tinyformat_test)
add_custom_target(testall COMMAND ${CMAKE_CTEST_COMMAND} -V ${ctest_config_opt} DEPENDS tinyformat_test)
option(COMPILE_SPEED_TEST FALSE)
if (COMPILE_SPEED_TEST)
add_executable(tinyformat_speed_test tinyformat_speed_test.cpp)
endif ()
@@ -3,8 +3,8 @@
# Should work with recent versions of both gcc and clang. (To compile with
# clang use "make CXX=clang++".)
CXXFLAGS?=-Wall
CXX11FLAGS?=-std=c++0x
CXXFLAGS?=-Wall -Werror
CXX11FLAGS?=-std=c++11
test: tinyformat_test_cxx98 tinyformat_test_cxx11
@echo running tests...

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit c665c21

Please sign in to comment.