diff options
| author | Claus Stovgaard <claus.stovgaard@gmail.com> | 2017-08-31 10:22:53 (GMT) |
|---|---|---|
| committer | Claus Stovgaard <claus.stovgaard@gmail.com> | 2017-08-31 10:22:53 (GMT) |
| commit | 34355c0e870efce3015fa19aff88c7d79839bbb1 (patch) | |
| tree | 0fa858569364bb5818793d97d264aefd365399b5 /.travis.yml | |
| parent | a6418a4dd19ea0e8aa5f7706b8bff12a2e453821 (diff) | |
| parent | 16bfba08e2c63c33834a98d092cd6f1a3e547289 (diff) | |
| download | googletest-34355c0e870efce3015fa19aff88c7d79839bbb1.zip googletest-34355c0e870efce3015fa19aff88c7d79839bbb1.tar.gz googletest-34355c0e870efce3015fa19aff88c7d79839bbb1.tar.bz2 | |
Merge remote-tracking branch 'github_google/master' into master-github_frosteyesrefs/pull/865/head
# Conflicts:
# .gitignore
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 3204dfa..c155e57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,11 +36,8 @@ compiler: script: ./travis.sh env: matrix: - - GTEST_TARGET=googletest SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE_MAKE=true VERBOSE - - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE_MAKE=true VERBOSE - - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug CXX_FLAGS=-std=c++11 VERBOSE_MAKE=true VERBOSE -# - GTEST_TARGET=googletest SHARED_LIB=ON STATIC_LIB=ON CMAKE_PKG=ON BUILD_TYPE=release VERBOSE_MAKE=false -# - GTEST_TARGET=googlemock SHARED_LIB=ON STATIC_LIB=ON CMAKE_PKG=ON BUILD_TYPE=release VERBOSE_MAKE=false + - SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE=1 + - SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE=1 CXX_FLAGS=-std=c++11 notifications: email: false sudo: false |