eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,224 Commits 13 Branches 14 Tags 23 MiB
88a63885a3
Commit Graph

2224 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gennadiy Civil
88a63885a3 Merge branch 'master' into issue_1735 2018-08-24 11:30:02 -04:00
Gennadiy Civil
dcf379f0ef Merge pull request #1779 from google/9A681768AABE08D1EFA5CA77528236A4 
Googletest export
 2018-08-23 20:00:01 -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
Gennadiy Civil
698c92ec2f Merge pull request #1338 from stefanosoffia/master 
Install CMake export files
 2018-08-22 13:05:06 -04:00
Stefano Soffia
ec5d5478fe Install CMake export files 
Rework of the closed pull request #768
 2018-08-22 17:27:11 +02:00
Gennadiy Civil
a7ed2b0383 Merge pull request #1682 from dakotahawkins/improve-exported-targets 
Improve CMake exported targets
 2018-08-21 13:51:42 -04: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
Gennadiy Civil
7db99f2ce4 Merge pull request #1194 from joshbodily/josh/fix_scoped_class2 
Fix scoped enum not working in gmock-gen.py
 2018-08-21 10:32:21 -04:00
Gennadiy Civil
be972a817d Merge branch 'master' into josh/fix_scoped_class2 2018-08-20 16:15:04 -04:00
Gennadiy Civil
f012a49a16 Update CONTRIBUTING.md 2018-08-20 16:08:33 -04:00
Gennadiy Civil
f2ca24e650 Merge pull request #1759 from gennadiycivil/master 
merge
 2018-08-20 15:42:27 -04:00
Gennadiy Civil
3935e0f83c merge 2018-08-20 14:57:53 -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
49710fa6e2 Testing, adding a few line to sample4 2018-08-20 14:17:38 -04:00
Gennadiy Civil
ef9b251c7e Testing, adding to sample4 unittest 2018-08-20 14:10:58 -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
a8dec1ebeb Merge pull request #1120 from tanzislam/fix_death_test_child_mingw_wer_issue1116 
Allow death test child to bypass Windows Error Reporting under MinGW
 2018-08-20 10:50:41 -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
9accf80ae3 Merge pull request #1347 from Burgch/fix-argc 
Fix value pointed to by `_NSGetArgc()` on macOS.
 2018-08-19 14:16:03 -04: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
Gennadiy Civil
e8b0dded96 Merge pull request #1652 from medithe/patch-1 
Cast the tr1::tuple_element template parameter to int
 2018-08-17 23:05:00 -04:00
Tanzinul Islam
21db77282d Merge branch 'fix_death_test_child_mingw_wer_issue1116' of https://github.com/tanzislam/googletest into fix_death_test_child_mingw_wer_issue1116 2018-08-18 00:00:41 +01: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
Gennadiy Civil
1adcd15737 Merge pull request #1748 from laixer/std 
std references shouldn't be fully qualified
 2018-08-17 15:44:11 -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
Gennadiy Civil
b252101b2e Merge pull request #1546 from henryiii/cleanup-cmake 
Clean up cache non-advanced variable for subproject
 2018-08-17 10:27:13 -04:00
Henry Schreiner
cc134a591e Merge branch 'master' into cleanup-cmake 2018-08-17 13:52:35 +02:00
Gennadiy Civil
c3ef06399d Merge pull request #1646 from tisi1988/master 
FIX: Compilation warning with GCC regarding a non-initialised member …
 2018-08-16 15:28:20 -04:00
Gennadiy Civil
8f76f4f0c1 was not quite right, 
Fomatting
 2018-08-16 15:11:40 -04: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
089ee439dd Merge pull request #1142 from scottslacksmith/master 
Fix/silence false positive memory leaks reported by Microsoft's debug CRT
 2018-08-16 13:34:03 -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
e41177d159 Merge branch 'master' into josh/fix_scoped_class2 2018-08-16 11:13:12 -04:00
Gennadiy Civil
b5f3df3456 Merge branch 'master' into master 2018-08-16 10:39:40 -04:00