diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-09-01 00:05:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-01 00:05:22 -0400 |
| commit | ee53b281ba16f5402e3a42003414a68d336fcd94 (patch) | |
| tree | 2e629c5674eb80d2090aca0c27f8388d5b4801da /.travis.yml | |
| parent | ca76206f4268a009427afa96dfd792012db64583 (diff) | |
| parent | 69e794ca75e6c07ad78a8f7467c267be9ac08921 (diff) | |
| download | googletest-ee53b281ba16f5402e3a42003414a68d336fcd94.tar.gz googletest-ee53b281ba16f5402e3a42003414a68d336fcd94.tar.bz2 googletest-ee53b281ba16f5402e3a42003414a68d336fcd94.zip | |
Merge branch 'master' into user_logger_instead_of_printf
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 |