summaryrefslogtreecommitdiffstats
path: root/travis.sh
diff options
context:
space:
mode:
authorHerbert Thielen <thielen@hs-worms.de>2017-08-31 06:47:26 (GMT)
committerGitHub <noreply@github.com>2017-08-31 06:47:26 (GMT)
commitd6c46ebd04e2e4f36fd799b43e2fd5342c10a891 (patch)
tree54604d1522bdd3612f08a2a15c4fa6df59f14711 /travis.sh
parentcfcc89a84a6fbb76dae4e24522267a1d0a94d696 (diff)
parent16bfba08e2c63c33834a98d092cd6f1a3e547289 (diff)
downloadgoogletest-d6c46ebd04e2e4f36fd799b43e2fd5342c10a891.zip
googletest-d6c46ebd04e2e4f36fd799b43e2fd5342c10a891.tar.gz
googletest-d6c46ebd04e2e4f36fd799b43e2fd5342c10a891.tar.bz2
Merge branch 'master' into hethi/issue-1175-cmake-build-type
Diffstat (limited to 'travis.sh')
-rwxr-xr-xtravis.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/travis.sh b/travis.sh
index 819e366..bd226a8 100755
--- a/travis.sh
+++ b/travis.sh
@@ -5,7 +5,6 @@ env | sort
mkdir build || true
cd build
cmake -Dgtest_build_samples=ON \
- -Dgmock_build_samples=ON \
-Dgtest_build_tests=ON \
-Dgmock_build_tests=ON \
-DCMAKE_CXX_FLAGS=$CXX_FLAGS \