Skip to content

Commit

Permalink
Travis: build with Ninja
Browse files Browse the repository at this point in the history
Because after making fully parallel builds possible we'd better start
using them to keep testing them.
  • Loading branch information
muggenhor committed Jan 23, 2017
1 parent 97f9221 commit c67dbe4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ addons:
- libboost-program-options-dev
- libboost-test-dev
- google-mock
- ninja-build

before_install:
- if [[ "${TRAVIS_OS_NAME}" = "osx" ]]; then brew update && brew install ninja; fi

script: ./travis.sh

Expand Down
11 changes: 6 additions & 5 deletions travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ gem install bundler
bundle install

cmake -E make_directory build
if [ -z ${GMOCK_PATH+x} ]; then
cmake -E chdir build cmake -DCUKE_ENABLE_EXAMPLES=on -DGMOCK_VER=${GMOCK_VER} ..
else
cmake -E chdir build cmake -DCUKE_ENABLE_EXAMPLES=on -DGMOCK_SRC_DIR=${GMOCK_PATH} ..
fi
cmake -E chdir build cmake \
-G Ninja \
-DCUKE_ENABLE_EXAMPLES=on \
${GMOCK_PATH:-"-DGMOCK_VER=${GMOCK_VER}"} \
${GMOCK_PATH:+"-DGMOCK_SRC_DIR=${GMOCK_PATH}"} \
..
cmake --build build
cmake --build build --target test
cmake --build build --target features
Expand Down

0 comments on commit c67dbe4

Please sign in to comment.