Daniel Krügler
89f828afa3
Merge branch 'master' into master
2017-08-23 11:11:44 +02:00
Gennadiy Civil
d2cf069fe2
Merge branch 'master' into vs-projects-fix
2017-08-22 22:38:22 -04:00
Gennadiy Civil
2e06cd7f60
Merge pull request #1220 from romkatv/property-matcher
...
Support ref-qualified member functions in Property().
2017-08-22 22:37:30 -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
drgler
10d96ee13f
Merge branch 'master' of github.com:Dani-Hub/googletest
2017-08-22 21:13:41 +02:00
drgler
57bd507b1f
Merge branch 'master' of github.com:Dani-Hub/googletest
2017-08-22 21:13:32 +02:00
drgler
4a8f72f8f1
Merge branch 'master' of github.com:Dani-Hub/googletest
2017-08-22 20:19:13 +02:00
drgler
0654fb095d
Merge branch 'master' of github.com:Dani-Hub/googletest
2017-08-22 20:18:54 +02:00
Roman Perepelitsa
75a9eed0f5
Support ref-qualified member functions in Property().
2017-08-22 16:06:26 +02:00
Daniel Krügler
71b9b22dd6
Merge branch 'master' into master
2017-08-21 20:14:09 +02:00
Gennadiy Civil
1f4def5cde
Merge branch 'master' into wrong-version-reported
2017-08-21 13:11:58 -04:00
Gennadiy Civil
63fecf15ab
Merge pull request #1206 from ShadowIce/methodname-in-exception
...
Add function name to exception if there's no default action
2017-08-21 10:37:53 -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
Gennadiy Civil
5378815478
Merge branch 'master' into methodname-in-exception
2017-08-18 16:26:02 -07:00
Gennadiy Civil
0d2f766b4e
Merge pull request #1215 from henryiii/patch-1
...
Adding CMake visibility policy setting
2017-08-18 16:25:03 -07:00
Henry Schreiner
3a31c6b4f4
Adding CMake visibility policy setting
...
This policy setting will silence a warning when using with a visibility settings on targets. Due to the forced `cmake_minimum_version`, policy settings in CMakeLists calling this one (including the main CMakeLists) are lost, forcing the change to be made here.
2017-08-18 15:18:58 -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
Gennadiy Civil
f1ed16cbd0
Merge branch 'master' into methodname-in-exception
2017-08-17 09:08:37 -07:00
Gennadiy Civil
26853b870a
Update README.md
...
Another AppVeyor move
2017-08-16 23:42:53 -07: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
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
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
