Merge branch 'upgrade-step1' into upgrade-step2

This commit is contained in:
Eric Fiselier 2015-03-09 14:43:45 -04:00
commit 5b0542d583

View File

@ -13,9 +13,6 @@ matrix:
- os: osx - os: osx
env: BUILD_TYPE=Release STD=c++11 env: BUILD_TYPE=Release STD=c++11
env:
- CTEST_OUTPUT_ON_FAILURE=1
language: language:
- cpp - cpp
@ -33,4 +30,4 @@ before_script:
script: script:
- cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_CXX_FLAGS="-std=${STD}" - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_CXX_FLAGS="-std=${STD}"
- make - make
- make test - make CTEST_OUTPUT_ON_FAILURE=1 test