Josh Bodily
80ee3be1d7
Merge branch 'master' into josh/fix_scoped_class2
2017-12-12 10:36:37 -07:00
Gennadiy Civil
7b956df687
Merge branch 'master' into use-system-includes
2017-12-08 15:11:13 -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
Wojciech Mamrak
98e909ef6d
Improved description of VS std::tuple support
2017-12-07 18:18:17 +01:00
Sam Lunt
332bd657f9
make includes system
2017-11-27 17:31:07 -06:00
Romain Geissler
56088debda
Remove gcc 6 misleading indentations.
2017-10-25 17:53:01 +02:00
Arkady Shapkin
a938f25467
Fix gmock tests when std::unary_function unavailable
2017-10-25 16:04:01 +03:00
Arkadiy Shapkin
950e2805da
Fix tests with VS2015 and VS2017
2017-10-25 16:04:01 +03:00
Dariusz Ostolski
916158a728
#1282 : Doc typo fix
2017-10-14 18:33:19 +02:00
Jonathan Wakely
c61e22b1fe
Use gender-neutral pronouns in comments and docs
2017-09-27 13:31:13 +01:00
Alex Yursha
4a74a92c89
Fix ellipsis position in examples
2017-09-08 17:20:59 -07:00
Gennadiy Civil
6cf47d4190
Merge pull request #975 from LebedevRI/respect-option
...
CMake: use threads if allowed and found, not just if found.
2017-09-05 13:07:37 -04:00
Gennadiy Civil
93d050ea56
Merge pull request #900 from Gallaecio/patch-1
...
Fix WhenSorted() documentation example
2017-09-01 15:20:54 -04:00
Roman Lebedev
7e25cea458
CMake: use threads if allowed and found, not just if found.
...
If the user's cmakelists.txt first look for threads using
find_package(Threads), then set(gtest_disable_pthreads ON),
and then include googletest. GoogleTest will not look for
threads. But since they have already been found before in
user's cmakelists, it will use them regardless.
This helped me fix build issue in darktable-org/rawspeed
on windows/MSYS2, even though there are threads, and they
are usable, googletest build was failing with issues
about AutoHandle. I was first looking for threads, and only
then including googletest, so no matter the value of
gtest_disable_pthreads, it failed.
The other obvious solution is for user to first include
googletest, and only then look for threads by himself.
2017-09-01 21:02:59 +03:00
Gennadiy Civil
4126de54a7
Merge pull request #1011 from zeitounator/wrong-version-reported
...
Wrong version reported (1.7.0 should be 1.8.0)
2017-09-01 13:38:26 -04:00
Herbert Thielen
b34d59baf1
change links from former code.google.com to current github repository
2017-08-31 18:12:17 +02:00
Herbert Thielen
f48ebe2bcc
use plural verb as mentioned in issue #1105
2017-08-29 21:20:46 +02:00
Herbert Thielen
f3f8930215
remove Yob's comma mentioned in issue #1105
2017-08-29 21:19:45 +02:00
Alyssa Wilk
7eb7cbb51d
Applying lint checks from upstream google3
2017-08-28 16:13:41 -04:00
Alyssa Wilk
6a0c4aab6d
Merge branch 'refs/heads/master' into flag-default
2017-08-28 16:10:12 -04:00
Arkady Shapkin
b0657ae844
Support x64 configuration for old VS2015 projects
2017-08-25 01:58:00 +03:00
Gennadiy Civil
d2cf069fe2
Merge branch 'master' into vs-projects-fix
2017-08-22 22:38:22 -04:00
Arkady Shapkin
40e2b2f67d
Support x64 configuration for old VS2010 projects
...
VS2010 solution only to simplify old users (who used these solutions) upgrading to new gtest/gmock, new users should use CMake generated solutions. VS2010 solution can be opened in any new VS.
2017-08-23 01:45:44 +03:00
Roman Perepelitsa
75a9eed0f5
Support ref-qualified member functions in Property().
2017-08-22 16:06:26 +02:00
Gennadiy Civil
1f4def5cde
Merge branch 'master' into wrong-version-reported
2017-08-21 13:11:58 -04:00
Maurice Gilden
fad8a6b4f5
Remove unused variable
2017-08-21 10:10:14 +02:00
Gennadiy Civil
9fdd6ccd92
Added "explicit" as per compiler suggestion
2017-08-20 15:20:13 -04:00
Gennadiy Civil
e5095758ba
Proposing these changes, please review
...
Slightly better names and cleaner tests.
Please review
2017-08-20 15:15:31 -04:00
Maurice Gilden
29e05dea1d
Change tabs to spaces in test case
2017-08-18 15:27:02 +02:00
Maurice Gilden
4d864c5e7d
Switch return type to class without default constructor
2017-08-18 12:28:50 +02:00
Maurice Gilden
e9a2da4cf8
Fix test if exceptions are not supported
2017-08-18 11:46:15 +02:00
Maurice Gilden
fe1b2563ab
adds test for NiceMock with unknown return value
2017-08-18 11:21:28 +02:00
Josh Bodily
60c30c6bd5
Merge branch 'master' into josh/fix_scoped_class2
2017-08-16 10:56:43 -06:00
Alyssa Wilk
6a4d19119e
Handling invalid flag values
2017-08-16 12:43:26 -04:00
Maurice Gilden
a63b714c18
Add function name to exception if there's no default action
2017-08-16 17:53:16 +02:00
David Seifert
a3ab075319
Add support for pkgconfig
2017-08-14 13:45:56 +02:00
Gennadiy Civil
028a1dbab1
Merge pull request #926 from bartshappee/patch-1
...
Fix small typo in Cookbook: SeArrayArgument
2017-08-11 10:33:36 -04:00
Gennadiy Civil
17af07aed9
Merge pull request #1160 from mwoehlke-kitware/honor-lib_suffix
...
Fix library install destinations
2017-08-11 09:14:49 -04:00
Gennadiy Civil
515e38398f
Merge pull request #957 from sglass68/sim
...
Fix a few documentation nits in the mock dummies guide
2017-08-10 21:25:06 -04:00
Gennadiy Civil
6c8b263997
Merge pull request #1164 from aninf-wo/hethi/remove-old-docs
...
remove documentation of former versions - it's available in the commit history
2017-08-10 21:19:03 -04:00
Gennadiy Civil
664a703c70
Merge pull request #1192 from eduherminio/master
...
Minor style fixes
2017-08-10 20:36:29 -04:00
Gennadiy Civil
26a5d30ac0
Merge pull request #1191 from gennadiycivil/master
...
Adding Bazel build to googletest (initial version )
2017-08-10 20:35:27 -04:00
Herbert Thielen
89bd69dff5
say "former version" instead of "released version"
2017-08-10 20:21:46 +02:00
Josh Bodily
8d77932ce1
Fix scoped enum not working in gmock-gen.py
2017-08-10 10:58:57 -06:00
Eduardo Caceres
fccdf51ece
Minor style fixes
...
Typos, punctuation & broken links
2017-08-10 18:05:32 +02:00
misterg
4d386daead
Added Copyright
2017-08-10 12:03:27 -04:00
misterg
a7b338585e
Initial Revision, review 164634031
2017-08-10 11:54:46 -04:00
Alyssa Wilk
10232c3adb
Adding a flag option to change the default mock type
2017-08-10 09:41:09 -04:00
Matthew Woehlke
92b6ea3c94
Fix library install destinations
...
Modify library install destinations to install .dll's to the correct
location (`bin`, not `lib`), and to install other artifacts to the
correct platform-dependent location by using GNUInstallDirs. This is
required for some distributions (e.g. Fedora) and will fix an issue that
otherwise requires those distributions to patch the upstream sources.
Also, add options to suppress installation, which may be useful for
projects that embed Google Test.
Since Google Test is trying to support archaic versions of CMake, a
brain-dead fallback (which requires that the user set either LIB_SUFFIX
or CMAKE_INSTALL_LIBDIR themselves) is included for versions that
predate GNUInstallDirs.
Fixes #1161 .
Co-Authored-By: d3x0r <d3x0r@users.noreply.github.com>
2017-08-09 15:29:36 -04:00
misterg
45b059daae
WIP
2017-08-09 14:37:58 -04:00
