eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,764 Commits 13 Branches 14 Tags
Commit Graph

888 Commits

Author SHA1 Message Date
Gennadiy Civil
88a63885a3 Merge branch 'master' into issue_1735 2018-08-24 11:30:02 -04:00
misterg
93d9926d27 Googletest export 
Remove unneeded check for NULL.
Note: this started as OSS PR https://github.com/google/googletest/pull/967 but changed
PiperOrigin-RevId: 209819732
 2018-08-23 16:03:46 -04:00
srz_zumix
fdd19fe97a Googletest export 
Internal Change

PiperOrigin-RevId: 209498445
 2018-08-23 16:03:39 -04:00
srz_zumix
3c02d17ef4 Googletest export 
Internal Change

PiperOrigin-RevId: 209471987
 2018-08-23 16:03:31 -04:00
Jacob Schloss
2186ade329 Merge branch 'master' into issue_1735 2018-08-22 12:55:43 -07:00
Jacob Schloss
d4c984e4a8 It seems like CMAKE_CXX_FLAGS is getting double appended when building as a nested cmake project, 
which breaks my build as gcc does not allow -specs=nosys.specs to be called multiple times.

Removing this fixes it and seems to keep the same compile options, just removing the duplicate definition.
 2018-08-22 11:17:32 -07:00
Stefano Soffia
ec5d5478fe Install CMake export files 
Rework of the closed pull request #768
 2018-08-22 17:27:11 +02:00
Dakota Hawkins
70c7e06c00 Improve CMake exported targets. 
I _think_ this represents some of the "best practices" for exporting
targets. They'll be available in a `googletest::` namespace (e.g.
`googletest::gmock`) with non-namespaced `ALIAS` targets.

- Added GOOGLETEST_VERSION variable
- Use `CMakePackageConfigHelpers`, bump minimum CMake version to 2.8.8

Signed-off-by: Dakota Hawkins <dakotahawkins@gmail.com>
 2018-08-21 13:02:09 -04:00
misterg
11b91b042a googletest export 
- 209457654 Import of OSS PR, https://github.com/google/googletest/pu... by misterg <misterg@google.com>

PiperOrigin-RevId: 209457654
 2018-08-20 14:50:48 -04:00
misterg
f11ec7dd52 googletest export 
- 209457486 Import of OSS PR, https://github.com/google/googletest/pu... by misterg <misterg@google.com>

PiperOrigin-RevId: 209457486
 2018-08-20 14:50:41 -04:00
Gennadiy Civil
3e5131bbd8 Merge pull request #1754 from vkotovv/docs-advanced-broken-links 
docs: fixed broken references to sections in Advanced guide
 2018-08-20 11:04:11 -04:00
Gennadiy Civil
c597f05687 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-08-20 10:21:32 -04:00
Vadim Kotov
4e5dc133a1 docs: fix more broken links to sections in Advanced guide 2018-08-20 16:20:14 +03:00
Vadim Kotov
4cc709baf5 docs: fixed broken references to sections in Advanced guide 2018-08-20 15:31:55 +03:00
Gennadiy Civil
b6e0bdc87e Merge branch 'master' into fix-argc 2018-08-19 14:03:30 -04:00
Gennadiy Civil
4ca5924de3 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-08-18 13:15:35 -04:00
Gennadiy Civil
9054a95a76 Merge pull request #1612 from wkaluza/fix-msvc-d9025-warning 
Remove default /EHsc compiler flag
 2018-08-17 23:27:19 -04:00
Tanzinul Islam
d6c0ea94c5 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-08-17 23:58:45 +01:00
Gennadiy Civil
42a3a3e5b0 Merge branch 'master' into patch-1 2018-08-17 15:45:35 -04:00
Vadim Berezniker
9b39018356 std references shouldn't be fully qualified 2018-08-17 10:49:10 -07:00
Gennadiy Civil
d0c8a01252 Formatting 2018-08-17 13:44:48 -04:00
Gennadiy Civil
d7d06d64cb Merge branch 'master' into patch-1 2018-08-17 13:31:01 -04:00
Gennadiy Civil
0637dca26b Minor formatting/style changes 2018-08-17 13:25:52 -04:00
Conor Burgess
dcdd155849 Merge branch 'master' into fix-argc 2018-08-17 17:15:32 +01:00
Gennadiy Civil
ec1ff6bc2a Merge branch 'master' into fix-msvc-d9025-warning 2018-08-17 11:48:56 -04:00
Henry Schreiner
cc134a591e Merge branch 'master' into cleanup-cmake 2018-08-17 13:52:35 +02:00
Gennadiy Civil
135bd480e0 Small formatting change 
And then we can merge
 2018-08-16 15:10:07 -04:00
Gennadiy Civil
f3d889b430 Merge branch 'master' into master 2018-08-16 13:37:53 -04:00
Gennadiy Civil
0c1dcc2998 Small style changes. 
Just small style changes and we can accept this PR
 2018-08-16 13:18:13 -04:00
Gennadiy Civil
b5f3df3456 Merge branch 'master' into master 2018-08-16 10:39:40 -04:00
Gennadiy Civil
0489d80590 Merge branch 'master' into cleanup-cmake 2018-08-15 13:02:54 -07:00
Gennadiy Civil
9b5ca3834a Merge branch 'master' into master 2018-08-15 11:33:15 -07:00
Gennadiy Civil
4b9d242dd1 Merge branch 'master' into patch-1 2018-08-15 08:37:15 -07:00
Gennadiy Civil
5b38636cb1 Merge branch 'master' into cmake-binary-dir-fix 2018-08-14 14:25:05 -07:00
Gennadiy Civil
ea90e723e0 more comments changes 2018-08-14 16:05:55 -04:00
Gennadiy Civil
1564048f79 Merge branch 'master' into cmake-binary-dir-fix 2018-08-14 12:55:13 -07:00
Gennadiy Civil
d2e8f7c999 more comments changes 2018-08-14 15:45:00 -04:00
Gennadiy Civil
f0bcc9b875 Comments changes, no functionality changes. 2018-08-14 15:04:11 -04:00
Gennadiy Civil
bdc777e251 Comments changes, no functionality changes 2018-08-14 14:04:07 -04:00
Gennadiy Civil
23c6b5b54e Merge branch 'master' into deprecate 2018-08-14 08:47:13 -07:00
Gennadiy Civil
175032a9e8 Code formatting changes, clean up, no functionality changes 2018-08-14 11:08:35 -04:00
Gennadiy Civil
dc6b2a66fb Merge branch 'master' into master 2018-08-14 07:42:41 -07:00
tisi1988
cf1d6b7516 Merge branch 'master' into master 2018-08-14 15:32:22 +02:00
Gennadiy Civil
b0f2daec87 formatting custom/README.md 2018-08-13 22:45:53 -04:00
Gennadiy Civil
5bdf9c5f70 formatting for new READMEs 2018-08-13 16:23:17 -04:00
Elias Daler
5d4126e1c4 Change location of generated pkg-config files from CMAKE_BINARY_DIR to gmock/gtest_BINARY_DIR (#1717) 2018-08-13 23:01:09 +03:00
Gennadiy Civil
cb6ebfcbd3 Merge branch 'master' into cross-testing-patch-1 2018-08-13 11:38:32 -07:00
Gennadiy Civil
14e8a3161d Move instructions into custom/README files 2018-08-13 14:31:56 -04:00
Yi Zheng
7c8c23717e - Fix the broken markdown table 
- Fix some format issue
 2018-08-13 17:57:51 +08:00
Gennadiy Civil
af497af914 Mode change on a python script 2018-08-10 15:42:16 -04:00