diff options
| author | Herbert Thielen <h-github@thielen-home.de> | 2017-08-30 10:43:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-30 10:43:54 +0200 |
| commit | c780e0e2c4e6d04a47d80068528471a9405c1665 (patch) | |
| tree | e8f1d22a92effe5933ff733be0ede324ec20b673 /.travis.yml | |
| parent | 8364718500dac72c141aa55dcb2483177356717d (diff) | |
| parent | 71e2858f32902ca736e2dc8d81b512a4dfa18b80 (diff) | |
| download | googletest-c780e0e2c4e6d04a47d80068528471a9405c1665.tar.gz googletest-c780e0e2c4e6d04a47d80068528471a9405c1665.tar.bz2 googletest-c780e0e2c4e6d04a47d80068528471a9405c1665.zip | |
Merge branch 'master' into hethi/travis-unused-cmake
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 3204dfac..c155e571 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 |