diff options
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rwxr-xr-x | travis.sh | 17 |
2 files changed, 12 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 4957987f..9ae5cb2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,7 @@ addons: - valgrind os: - linux + - osx language: cpp compiler: - gcc @@ -17,13 +17,18 @@ set -vex env | sort -cmake -DJSONCPP_WITH_CMAKE_PACKAGE=$CMAKE_PKG -DBUILD_SHARED_LIBS=$SHARED_LIB -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_VERBOSE_MAKEFILE=$VERBOSE_MAKE . -make +mkdir build -# Python is not available in Travis for osx. -# https://github.com/travis-ci/travis-ci/issues/2320 +mkdir build/googletest +( cd build/googletest && cmake ../../googletest ) if [ "$TRAVIS_OS_NAME" != "osx" ] then - make - # valgrind --error-exitcode=42 --leak-check=full ./src/test_lib_json/jsoncpp_test +( cd build/googletest && make ) +fi + +mkdir build/googlemock +( cd build/googlemock && cmake ../../googlemock ) +if [ "$TRAVIS_OS_NAME" != "osx" ] +then + ( cd build/googlemock && make ) fi |