Skip to content

Commit

Permalink
Remove CMake compatibility from travis-build.sh for now.
Browse files Browse the repository at this point in the history
  • Loading branch information
qris committed Sep 2, 2016
1 parent 2316458 commit f5e74d8
Showing 1 changed file with 11 additions and 21 deletions.
32 changes: 11 additions & 21 deletions infrastructure/travis-build.sh
Expand Up @@ -5,27 +5,17 @@ set -x

ccache -s

if [ "$BUILD" = 'cmake' ]; then
cd `dirname $0`
mkdir -p cmake/build
cd cmake/build
cmake --version
cmake -DCMAKE_BUILD_TYPE:STRING=Debug ..
make install
[ "$TEST" = "n" ] || ctest -V
else
cd `dirname $0`/..
./bootstrap
./configure CC="ccache $CC" CXX="ccache $CXX" "$@"
grep CXX config.status
make V=1
./runtest.pl ALL $TEST_TARGET
# When making a release build, also check that we can build the default
# target and "parcels" (which is the same thing):
if [ "$TEST_TARGET" = "release" ]; then
make
make parcels
fi
cd `dirname $0`/..
./bootstrap
./configure CC="ccache $CC" CXX="ccache $CXX" "$@"
grep CXX config.status
make V=1
./runtest.pl ALL $TEST_TARGET
# When making a release build, also check that we can build the default
# target and "parcels" (which is the same thing):
if [ "$TEST_TARGET" = "release" ]; then
make
make parcels
fi

ccache -s

0 comments on commit f5e74d8

Please sign in to comment.