Josh Bodily
98863b0aee
Merge branch 'master' into josh/fix_scoped_class2
2017-08-16 17:00:47 -06:00
Gennadiy Civil
e8f65b365e
Merge branch 'master' into methodname-in-exception
2017-08-16 15:27:29 -07:00
Gennadiy Civil
e933b7f1bb
Merge pull request #1205 from mwoehlke-kitware/fix-gtest-install
...
Fix problem installing gtest when gmock enabled
2017-08-16 11:26:58 -07: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
Matthew Woehlke
8dabb36856
Fix problem installing gtest when gmock enabled
...
Fix a bug deciding whether to enable the option to install Google Test
caused by one of the dependent option dependencies not being defined
yet.
Fixes #1198 ; impossible to install Google Test if Google Mock is built.
2017-08-16 10:49:06 -04:00
Gennadiy Civil
fd6bce6233
Merge pull request #1204 from gennadiycivil/master
...
Changing Build Status AppVeyor badge with AppVeyor ownership change
2017-08-14 16:05:27 -07:00
Gennadiy Civil
0a93e0426a
Merge branch 'master' into master
2017-08-14 15:29:51 -07:00
misterg
d0587e9198
Change AppVeyor Status Badge to point to new AppVeyor Project Location
2017-08-14 18:22:03 -04:00
misterg
9a2a240b09
Change AppVeyor Status Badge to point to new AppVeyor Project Location
2017-08-14 18:21:07 -04:00
gpetit
03b4383719
Removed extra colon in error log
2017-08-14 15:30:01 -04:00
Gennadiy Civil
6c16d326c0
Merge pull request #1197 from SoapGentoo/pkgconfig
...
Add support for pkgconfig
2017-08-14 14:33:41 -04:00
gpetit
65ea26e1ad
Merge remote-tracking branch 'origin/master' into user_logger_instead_of_printf
2017-08-14 13:45:45 -04:00
gpetit
496f7ee6fa
Use GTEST_LOG instead of printf
2017-08-14 13:45:27 -04:00
gpetit
a8272d140f
Merge remote-tracking branch 'origin/master' into support_xboxone
2017-08-14 12:49:22 -04:00
gpetit
8b2f15f7ac
Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne
2017-08-14 12:42:23 -04:00
David Seifert
70c8a8e0bd
Add documentation for pkg-config
2017-08-14 13:45:56 +02:00
David Seifert
a3ab075319
Add support for pkgconfig
2017-08-14 13:45:56 +02:00
Che-Hsun Liu
938d669435
Merge branch 'master' into master
2017-08-14 14:51:49 +08:00
Gennadiy Civil
be0f3823ba
Merge pull request #905 from iignatev/master
...
enable null detection on Solaris Studio 12u4+
2017-08-13 21:34:10 -04:00
Gennadiy Civil
2b60274124
Merge pull request #857 from KindDragon/patch-1
...
Add links to IRC channel and Google Group
2017-08-11 11:29:50 -04:00
Gennadiy Civil
b94f15fabb
Merge pull request #919 from delaitre/patch-1
...
Fix the link to the float comparison article
2017-08-11 10:39:13 -04:00
Gennadiy Civil
0e5d03d971
Merge pull request #749 from nholthaus/patch-1
...
Documentation change to add related open source project
2017-08-11 10:38:05 -04: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
240309b6a2
Merge pull request #871 from tommyleo2/master
...
Update Primer.md
2017-08-10 21:34:15 -04:00
Gennadiy Civil
db1a847416
Merge pull request #937 from srz-zumix/fix-gtest-port-typo
...
Fix or condition typo ( '|' -> '||' )
2017-08-10 21:30:13 -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
4da1d9769d
Merge pull request #1127 from zulkarnine/patch-1
...
Fix background color in ColoredPrintf
2017-08-10 20:43:26 -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
misterg
f326bd27b2
Addressing Comments
2017-08-10 16:33:22 -04:00
misterg
91530fbb76
Addressing comments
2017-08-10 15:33:09 -04:00
drgler
279217d8c9
Merge branch 'master' of github.com:Dani-Hub/googletest
2017-08-10 21:19:31 +02:00
drgler
0d121065b4
Merge branch 'master' of github.com:Dani-Hub/googletest
2017-08-10 21:18:22 +02:00
Gennadiy Civil
73f7b07fb7
Update WORKSPACE
...
Remove comments
2017-08-10 14:47:24 -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
Gennadiy Civil
d47ef4b7dc
Merge pull request #1178 from aninf-wo/hethi/testsuite-hint
...
add note about different definitions of Test Case
2017-08-10 09:13:45 -04:00
Herbert Thielen
23c3feba97
clarify distinction regarding Test Case
2017-08-10 10:08:08 +02: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
drgler
c495acc6e1
Merge branch 'master' of github.com:Dani-Hub/googletest
2017-08-09 19:11:11 +02:00
drgler
ec538fc0b8
Infinite Loop when calling a mock function that takes boost::filesystem::path as parameter #521 : Add is_same type trait and prevent infinite loops for recursive containers
2017-08-09 19:08:22 +02:00
