aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1189 from alyssawilk/flag-defaultGennadiy Civil2017-08-296-3/+132
|\ | | | | Adding a flag option to change the default mock type
| * Applying lint checks from upstream google3Alyssa Wilk2017-08-281-4/+7
| |
| * Merge branch 'refs/heads/master' into flag-defaultAlyssa Wilk2017-08-28115-28062/+2959
| |\ | |/ |/|
* | Merge pull request #1222 from KindDragon/vs-projects-fix3Gennadiy Civil2017-08-254-7/+216
|\ \ | | | | | | Support x64 configuration for old VS2015 projects
| * \ Merge branch 'master' into vs-projects-fix3Gennadiy Civil2017-08-2410-1222/+0
| |\ \ | |/ / |/| |
* | | Merge pull request #1221 from KindDragon/vs-projects-fix2Gennadiy Civil2017-08-2410-1222/+0
|\ \ \ | | | | | | | | Remove gtest VS2005 projects
| * | | Remove gtest VS2005 projectsArkady Shapkin2017-08-2510-1222/+0
|/ / /
| * / Support x64 configuration for old VS2015 projectsArkady Shapkin2017-08-254-7/+216
|/ /
* | Merge pull request #1186 from Dani-Hub/masterGennadiy Civil2017-08-244-8/+74
|\ \ | | | | | | Prevent infinite loops for recursive containers like boost::filesystem::path
| * \ Merge branch 'master' into masterGennadiy Civil2017-08-2323-22/+1879
| |\ \ | |/ / |/| |
* | | Merge pull request #1219 from KindDragon/vs-projects-fixGennadiy Civil2017-08-2323-22/+1879
|\ \ \ | | | | | | | | Support x64 configuration for VS2010 projects
| * \ \ Merge branch 'master' into vs-projects-fixGennadiy Civil2017-08-222-8/+47
| |\ \ \ | |/ / / |/| | |
| * | | Support x64 configuration for old VS2010 projectsArkady Shapkin2017-08-2323-22/+1879
| | | | | | | | | | | | | | | | 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.
| | * | Merge branch 'master' into masterDaniel Krügler2017-08-232-8/+47
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #1220 from romkatv/property-matcherGennadiy Civil2017-08-222-8/+47
|\ \ \ \ | |/ / / |/| | | Support ref-qualified member functions in Property().
| * | | Support ref-qualified member functions in Property().Roman Perepelitsa2017-08-222-8/+47
|/ / /
| * | Merge branch 'master' of github.com:Dani-Hub/googletestdrgler2017-08-220-0/+0
| |\ \
| | * \ Merge branch 'master' of github.com:Dani-Hub/googletestdrgler2017-08-2293-26841/+845
| | |\ \
| * | \ \ Merge branch 'master' of github.com:Dani-Hub/googletestdrgler2017-08-2294-26841/+847
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge branch 'master' into masterDaniel Krügler2017-08-2193-26841/+845
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #1206 from ShadowIce/methodname-in-exceptionGennadiy Civil2017-08-212-1/+24
|\ \ \ \ | | | | | | | | | | Add function name to exception if there's no default action
| * | | | Remove unused variableMaurice Gilden2017-08-211-1/+0
| | | | |
| * | | | Added "explicit" as per compiler suggestionGennadiy Civil2017-08-201-1/+1
| | | | |
| * | | | Proposing these changes, please reviewGennadiy Civil2017-08-201-12/+9
| | | | | | | | | | | | | | | | | | | | Slightly better names and cleaner tests. Please review
| * | | | Merge branch 'master' into methodname-in-exceptionGennadiy Civil2017-08-181-0/+4
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1215 from henryiii/patch-1Gennadiy Civil2017-08-181-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Adding CMake visibility policy setting
| * | | | | Adding CMake visibility policy settingHenry Schreiner2017-08-181-0/+4
|/ / / / / | | | | | | | | | | 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.
| * | | | Change tabs to spaces in test caseMaurice Gilden2017-08-181-11/+11
| | | | |
| * | | | Switch return type to class without default constructorMaurice Gilden2017-08-181-1/+7
| | | | |
| * | | | Fix test if exceptions are not supportedMaurice Gilden2017-08-181-0/+6
| | | | |
| * | | | adds test for NiceMock with unknown return valueMaurice Gilden2017-08-181-0/+15
| | | | |
| * | | | Merge branch 'master' into methodname-in-exceptionGennadiy Civil2017-08-171-2/+1
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Update README.mdGennadiy Civil2017-08-161-2/+1
| | | | | | | | | | | | | | | Another AppVeyor move
| * | | | Merge branch 'master' into methodname-in-exceptionGennadiy Civil2017-08-161-1/+2
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1205 from mwoehlke-kitware/fix-gtest-installGennadiy Civil2017-08-161-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix problem installing gtest when gmock enabled
| * | | | | Fix problem installing gtest when gmock enabledMatthew Woehlke2017-08-161-1/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * / / / Add function name to exception if there's no default actionMaurice Gilden2017-08-161-1/+1
|/ / / /
* | | | Merge pull request #1204 from gennadiycivil/masterGennadiy Civil2017-08-141-1/+2
|\ \ \ \ | | | | | | | | | | Changing Build Status AppVeyor badge with AppVeyor ownership change
| * \ \ \ Merge branch 'master' into masterGennadiy Civil2017-08-1474-26804/+443
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1197 from SoapGentoo/pkgconfigGennadiy Civil2017-08-149-4/+229
|\ \ \ \ \ | | | | | | | | | | | | Add support for pkgconfig
| * | | | | Add documentation for pkg-configDavid Seifert2017-08-142-0/+152
| | | | | |
| * | | | | Add support for pkgconfigDavid Seifert2017-08-147-4/+77
|/ / / / /
* | | | | Merge pull request #905 from iignatev/masterGennadiy Civil2017-08-131-2/+3
|\ \ \ \ \ | | | | | | | | | | | | enable null detection on Solaris Studio 12u4+
| * | | | | enable null detection on Solaris Studio 12u4+iignatev2016-10-171-2/+3
| | | | | |
* | | | | | Merge pull request #857 from KindDragon/patch-1Gennadiy Civil2017-08-111-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add links to IRC channel and Google Group
| * | | | | | Add links to IRC channel and Google GroupArkady Shapkin2016-08-241-3/+3
| | | | | | |
* | | | | | | Merge pull request #919 from delaitre/patch-1Gennadiy Civil2017-08-110-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix the link to the float comparison article
| * | | | | | | Fix the link to the float comparison articleJérémie Delaitre2016-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | As explained on the previous link, the article has been rewritten and moved.
* | | | | | | | Merge pull request #749 from nholthaus/patch-1Gennadiy Civil2017-08-111-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Documentation change to add related open source project
| * | | | | | | | made capitalization more consistent with other projects.Nic Holthaus2016-03-261-1/+1
| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 00:29:13 +0000