generic-library/valijson
1
0
Fork 0
mirror of https://github.com/tristanpenman/valijson.git synced 2025-03-03 12:58:03 +01:00
Code Issues Projects Releases Wiki Activity

Update travis build script to add -DBOOST_NO_CXX11_ALLOCATOR compiler flag for clang++ builds

Browse Source
This commit is contained in:
Tristan Penman 2016-02-02 07:54:45 -08:00
parent f88cc803cd
commit 3fa4807bcf
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
travis.sh
View File

@ -19,8 +19,14 @@ fi
mkdir -p build
pushd build > /dev/null
# Boost does not correctly identify version of libstdc++ used by clang
CMAKE_FLAGS=
if [[ $CXX == 'clang++' ]]; then
CMAKE_FLAGS=-DCMAKE_CXX_FLAGS=-DBOOST_NO_CXX11_ALLOCATOR
fi
echo "Attempting to build and run test suite with C++11 support disabled..."
cmake -DVALIJSON_CXX11_ADAPTERS=disabled ..
cmake $CMAKE_FLAGS -DVALIJSON_CXX11_ADAPTERS=disabled ..
make
./test_suite
@ -30,7 +36,7 @@ if [[ $CXX == 'g++' ]]; then
else
echo "Attempting to build and run test suite with C++11 support enabled..."
make clean
cmake -DVALIJSON_CXX11_ADAPTERS=enabled ..
cmake $CMAKE_FLAGS -DVALIJSON_CXX11_ADAPTERS=enabled ..
make
./test_suite
fi
@ -38,3 +44,4 @@ fi
make clean
popd > /dev/null