diff options
author | deki <deki@google.com> | 2015-09-07 18:23:25 -0400 |
---|---|---|
committer | deki <deki@google.com> | 2015-09-07 18:23:25 -0400 |
commit | 517b3bdc29d0ee9289443b56c981f52bd67d4f76 (patch) | |
tree | 518e53ee452b85a1967040d7846083bd97008320 | |
parent | f570b27e15a4e921d59495622a82277a3e1e8f87 (diff) | |
download | googletest-517b3bdc29d0ee9289443b56c981f52bd67d4f76.tar.gz googletest-517b3bdc29d0ee9289443b56c981f52bd67d4f76.tar.bz2 googletest-517b3bdc29d0ee9289443b56c981f52bd67d4f76.zip |
Add c++11 build to the Travis matrix.
-rw-r--r-- | .travis.yml | 1 | ||||
-rwxr-xr-x | travis.sh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index cd3485cd..90002648 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,6 +38,7 @@ 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 notifications: @@ -9,6 +9,7 @@ cmake -Dgtest_build_samples=ON \ -Dgmock_build_samples=ON \ -Dgtest_build_tests=ON \ -Dgmock_build_tests=ON \ + -DCMAKE_CXX_FLAGS=$CXX_FLAGS \ ../../$GTEST_TARGET make make test |