Commit Graph

1607 Commits

Author SHA1 Message Date
Maurice Gilden
5b4166f05f Add function name to exception if there's no default action 2017-08-16 17:53:16 +02:00
Matthew Woehlke
9469fb687d 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
5ed471caec 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
08b1a1f73c Merge branch 'master' into master 2017-08-14 15:29:51 -07:00
misterg
3f3a3ada20 Change AppVeyor Status Badge to point to new AppVeyor Project Location 2017-08-14 18:22:03 -04:00
misterg
a4121dd54b Change AppVeyor Status Badge to point to new AppVeyor Project Location 2017-08-14 18:21:07 -04:00
gpetit
ca76206f42 Removed extra colon in error log 2017-08-14 15:30:01 -04:00
Gennadiy Civil
e0fc65c5fb Merge pull request #1197 from SoapGentoo/pkgconfig
Add support for pkgconfig
2017-08-14 14:33:41 -04:00
gpetit
0c3c811164 Merge remote-tracking branch 'origin/master' into user_logger_instead_of_printf 2017-08-14 13:45:45 -04:00
gpetit
8f04622cc1 Use GTEST_LOG instead of printf 2017-08-14 13:45:27 -04:00
gpetit
6219d60eb9 Merge remote-tracking branch 'origin/master' into support_xboxone 2017-08-14 12:49:22 -04:00
gpetit
c113a7151d Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne 2017-08-14 12:42:23 -04:00
David Seifert
9cacce4e5c Add documentation for pkg-config 2017-08-14 13:45:56 +02:00
David Seifert
8604c4adac Add support for pkgconfig 2017-08-14 13:45:56 +02:00
Che-Hsun Liu
24696c3958 Merge branch 'master' into master 2017-08-14 14:51:49 +08:00
Gennadiy Civil
673c975a96 Merge pull request #905 from iignatev/master
enable null detection on Solaris Studio 12u4+
2017-08-13 21:34:10 -04:00
Gennadiy Civil
9816b96a6d 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
c7f4849c0b 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
052df998c4 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
e533ff4bd3 Merge pull request #926 from bartshappee/patch-1
Fix small typo in Cookbook: SeArrayArgument
2017-08-11 10:33:36 -04:00
Gennadiy Civil
e3bd4cbeae Merge pull request #1160 from mwoehlke-kitware/honor-lib_suffix
Fix library install destinations
2017-08-11 09:14:49 -04:00
Gennadiy Civil
c81be0f6fc Merge pull request #871 from tommyleo2/master
Update Primer.md
2017-08-10 21:34:15 -04:00
Gennadiy Civil
c523461f3a 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
4283f264d6 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
c822c85659 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
1579064390 Merge pull request #1127 from zulkarnine/patch-1
Fix background color in ColoredPrintf
2017-08-10 20:43:26 -04:00
Gennadiy Civil
cfab28d594 Merge pull request #1192 from eduherminio/master
Minor style fixes
2017-08-10 20:36:29 -04:00
Gennadiy Civil
e578186528 Merge pull request #1191 from gennadiycivil/master
Adding Bazel build to googletest (initial version )
2017-08-10 20:35:27 -04:00
misterg
97a8498873 Addressing Comments 2017-08-10 16:33:22 -04:00
misterg
c3f65335b7 Addressing comments 2017-08-10 15:33:09 -04:00
drgler
b11b2e403e Merge branch 'master' of github.com:Dani-Hub/googletest 2017-08-10 21:19:31 +02:00
drgler
07bba78a5f Merge branch 'master' of github.com:Dani-Hub/googletest 2017-08-10 21:18:22 +02:00
Gennadiy Civil
4e284ee657 Update WORKSPACE
Remove comments
2017-08-10 14:47:24 -04:00
Herbert Thielen
dc7214f222 say "former version" instead of "released version" 2017-08-10 20:21:46 +02:00
Eduardo Caceres
854b28f199 Minor style fixes
Typos, punctuation & broken links
2017-08-10 18:05:32 +02:00
misterg
cb5b05436d Added Copyright 2017-08-10 12:03:27 -04:00
misterg
b98e30b427 Initial Revision, review 164634031 2017-08-10 11:54:46 -04:00
Alyssa Wilk
6e1970e237 Adding a flag option to change the default mock type 2017-08-10 09:41:09 -04:00
Gennadiy Civil
75f0723c45 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
c09e9e646d clarify distinction regarding Test Case 2017-08-10 10:08:08 +02:00
Matthew Woehlke
0e8e0e07d6 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
66a036959f WIP 2017-08-09 14:37:58 -04:00
drgler
2606c7a670 Merge branch 'master' of github.com:Dani-Hub/googletest 2017-08-09 19:11:11 +02:00
drgler
71ca4bae10 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
drgler
484ec91c22 Infinite Loop when calling a mock function that takes boost::filesystem::path as parameter #521: Add is_same type trait 2017-08-09 19:07:22 +02:00
misterg
5a5e3c17bb Added googlemock tests 2017-08-09 12:18:12 -04:00
misterg
4f5c01b4c9 Added googlemock tests 2017-08-09 12:15:00 -04:00
misterg
ac885f3ab2 WIP 2017-08-09 11:47:54 -04:00
Herbert Thielen
33edcaed89 be more specific on Test Case 2017-08-09 16:41:38 +02:00
Gennadiy Civil
b322d1d91d Merge pull request #1185 from eduherminio/master
Fix punctuation in docs
2017-08-09 10:28:35 -04:00