David Benjamin
|
914dda29f4
|
Avoid warning C4619 in MSVC 2017.
C4800 has since been removed in MSVC 2017, so trying to silence it
throws warning C4619 when enabled.
|
2017-12-25 11:02:02 -05:00 |
|
Carlos O'Ryan
|
e096cfaaf1
|
Build both googletest and googlemock.
|
2017-12-24 12:22:46 -05:00 |
|
Carlos O'Ryan
|
cbd3ad0155
|
Create a autotools-based build for Travis.
When this build works, we know the autoconf support is working.
|
2017-12-24 12:22:17 -05:00 |
|
Gennadiy Civil
|
bc5eddec4c
|
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
|
2017-12-22 14:47:25 -05:00 |
|
Gennadiy Civil
|
26ea55166f
|
Merge pull request #778 from gpakosz/C4389
Re-enable MSVC++ C4389 warning in CmdHelperEq()
|
2017-12-21 21:10:03 -05:00 |
|
Gregory Pakosz
|
00c2c50f88
|
Re-enable MSVC++ C4389 warning in CmdHelperEq()
C4389 was inhibited in commit 4b83461 making behavior inconsistent with
other compilers.
|
2017-12-21 16:35:38 +01:00 |
|
Gennadiy Civil
|
bf3768bb20
|
Merge pull request #1357 from bryanzim/master
CMake fixes for paths with spaces
|
2017-12-20 15:57:28 -05:00 |
|
bryanzim
|
508b23f964
|
Update internal_utils.cmake
|
2017-12-20 10:06:20 -05:00 |
|
bryanzim
|
52e12448a8
|
Merge branch 'master' into master
|
2017-12-20 08:21:22 -05:00 |
|
Gennadiy Civil
|
afcf3a5265
|
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
|
2017-12-19 13:43:22 -05:00 |
|
Gennadiy Civil
|
b4bfa326b0
|
Merge pull request #1248 from aninf-wo/hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
remove GTEST_HAS_PARAM_TESTS
|
2017-12-19 13:18:57 -05:00 |
|
Gennadiy Civil
|
109233429c
|
Merge pull request #1212 from qzmfranklin/bazel
Also build when included in source.
|
2017-12-19 12:02:33 -05:00 |
|
Gennadiy Civil
|
e9c19a9abb
|
Update gtest-param-test.h.pump
|
2017-12-19 10:58:37 -05:00 |
|
Gennadiy Civil
|
acb41a3e4a
|
Update gtest-param-test.h.pump
|
2017-12-19 10:55:49 -05:00 |
|
Gennadiy Civil
|
9291399ef3
|
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
|
2017-12-18 12:02:12 -05:00 |
|
Gennadiy Civil
|
dfbc1773d6
|
Merge branch 'master' into bazel
|
2017-12-18 11:38:08 -05:00 |
|
bryanzim
|
0e0dc8cdfb
|
Merge branch 'master' into master
|
2017-12-15 16:52:50 -05:00 |
|
Gennadiy Civil
|
4f3a212568
|
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
|
2017-12-15 15:49:46 -05:00 |
|
Gennadiy Civil
|
3e48195784
|
Merge pull request #1354 from coryan/fix-top-level-license
Add top-level LICENSE and CONTRIBUTING.md files [skip ci]
|
2017-12-15 15:49:18 -05:00 |
|
Josh Bodily
|
80ee3be1d7
|
Merge branch 'master' into josh/fix_scoped_class2
|
2017-12-12 10:36:37 -07:00 |
|
Carlos O'Ryan
|
414af0e8a5
|
Merge branch 'fix-top-level-license' of github.com:coryan/googletest into fix-top-level-license
|
2017-12-11 19:34:19 -05:00 |
|
Carlos O'Ryan
|
3c218ff29c
|
Refactor docs about contributions to CONTRIBUTING.md.
Per the review comments.
|
2017-12-11 19:33:27 -05:00 |
|
bryanzim
|
13a4a325a5
|
Merge branch 'master' into master
|
2017-12-11 14:11:28 -05:00 |
|
Gennadiy Civil
|
0cbe36bada
|
Merge branch 'master' into fix-top-level-license
|
2017-12-11 13:13:07 -05:00 |
|
Gennadiy Civil
|
b0ed245299
|
Merge pull request #1355 from coryan/blaze-build-travis
Implement bazel-based builds in Travis.
|
2017-12-11 13:08:20 -05:00 |
|
Bryan Zimmerman
|
531d5ef77a
|
remove extra line
|
2017-12-11 12:21:35 -05:00 |
|
Bryan Zimmerman
|
4136c40a6f
|
remove implicit casts
|
2017-12-11 12:19:56 -05:00 |
|
Gennadiy Civil
|
a8e0fde335
|
Merge branch 'master' into blaze-build-travis
|
2017-12-11 10:48:12 -05:00 |
|
bryanzim
|
0fb3f4c80b
|
Merge branch 'master' into master
|
2017-12-11 09:37:55 -05:00 |
|
Gennadiy Civil
|
000582a49b
|
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
|
2017-12-09 09:41:02 -05:00 |
|
Gennadiy Civil
|
359a89436c
|
Merge pull request #1333 from sam-lunt/use-system-includes
Use system includes
|
2017-12-09 09:38:16 -05:00 |
|
Carlos O'Ryan
|
b835337f48
|
Also add documentation around becoming a contributor.
|
2017-12-08 23:20:55 -05:00 |
|
Carlos O'Ryan
|
040cee972e
|
Wrong LICENSE file, sorry. Corrected. [skip ci]
|
2017-12-08 23:16:46 -05:00 |
|
Carlos O'Ryan
|
71ba2c8764
|
Implement bazel-based builds in Travis.
This refactored test build scripts to enable
bazel-build scripts in Travis.
|
2017-12-08 20:59:07 -05:00 |
|
Carlos O'Ryan
|
077becb7eb
|
Add Apache-2.0 LICENSE file.
|
2017-12-08 17:24:23 -05:00 |
|
Gennadiy Civil
|
7b956df687
|
Merge branch 'master' into use-system-includes
|
2017-12-08 15:11:13 -05:00 |
|
bryanzim
|
2173579701
|
Merge branch 'master' into master
|
2017-12-08 13:11:34 -05:00 |
|
Gennadiy Civil
|
04f2b1692f
|
Merge pull request #1340 from coryan/fix-googlemock-test-build-file
Add licenses() directive for googlemock/tests.
|
2017-12-08 13:03:20 -05:00 |
|
Carlos O'Ryan
|
63723d54aa
|
Add licenses() directive for googlemock/tests.
Without the directive embedding googletest into third_party breaks
any //... target.
|
2017-12-08 12:08:25 -05:00 |
|
Gennadiy Civil
|
d70b7007c1
|
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
|
2017-12-08 11:56:41 -05:00 |
|
Gennadiy Civil
|
d8ff3710a0
|
Merge branch 'master' into fix-argc
|
2017-12-08 11:55:08 -05:00 |
|
bryanzim
|
5845063480
|
Merge branch 'master' into master
|
2017-12-08 11:31:31 -05:00 |
|
Gennadiy Civil
|
f59e68345b
|
Merge branch 'master' into fix-core-dump-shared
|
2017-12-08 11:12:19 -05:00 |
|
Gennadiy Civil
|
4cc47a1a75
|
Merge pull request #1345 from coryan/fix-travis-build-macOS
Fix Travis build
|
2017-12-08 11:09:01 -05:00 |
|
Gennadiy Civil
|
a1bba746bc
|
Merge branch 'master' into fix-travis-build-macOS
|
2017-12-08 11:08:54 -05:00 |
|
Gennadiy Civil
|
95958e9f16
|
Merge pull request #1348 from wmamrak/master
Remove C4996 warning in VS2017
|
2017-12-08 11:08:17 -05:00 |
|
Wojciech Mamrak
|
8f178075b9
|
Remove C4996 warning in VS2017
|
2017-12-07 18:20:25 +01:00 |
|
Wojciech Mamrak
|
98e909ef6d
|
Improved description of VS std::tuple support
|
2017-12-07 18:18:17 +01:00 |
|
Wojciech Mamrak
|
e858bd6b7c
|
Improved description of VS std::tuple support
|
2017-12-07 18:17:43 +01:00 |
|
Conor Burgess
|
b27773fbd1
|
Fix location of _NSGetArgv correction.
|
2017-12-07 11:49:33 +00:00 |
|