aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1160 from mwoehlke-kitware/honor-lib_suffixGennadiy Civil2017-08-111-4/+8
|\ | | | | Fix library install destinations
| * Fix library install destinationsMatthew Woehlke2017-08-091-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge pull request #957 from sglass68/simGennadiy Civil2017-08-101-2/+2
|\ \ | | | | | | Fix a few documentation nits in the mock dummies guide
| * | Fix a few documentation nits in the mock dummies guideSimon Glass2016-12-081-2/+2
| | | | | | | | | | | | Add a hyphen to 'ad hoc' and change 'distance' to plural.
* | | Merge pull request #1164 from aninf-wo/hethi/remove-old-docsGennadiy Civil2017-08-1016-14883/+6
|\ \ \ | | | | | | | | remove documentation of former versions - it's available in the commit history
| * | | say "former version" instead of "released version"Herbert Thielen2017-08-101-1/+1
| | | |
| * | | Merge branch 'master' into hethi/remove-old-docsHerbert Thielen2017-08-099-18/+52
| |\ \ \
| * | | | remove doc of former versionsHerbert Thielen2017-07-3015-14880/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation of former versions is available in the history (e.g. by checking out the appropriate git tags), so there is no need to keep them in parallel to the current documentation.
| * | | | remove obsolete reference to SVN trunk and fix link to pump manualHerbert Thielen2017-07-301-3/+6
| | | | |
* | | | | Merge pull request #1192 from eduherminio/masterGennadiy Civil2017-08-101-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Minor style fixes
| * | | | | Minor style fixesEduardo Caceres2017-08-101-1/+1
| | |/ / / | |/| | | | | | | | Typos, punctuation & broken links
* | | | | Merge pull request #1191 from gennadiycivil/masterGennadiy Civil2017-08-101-0/+52
|\ \ \ \ \ | |/ / / / |/| | | | Adding Bazel build to googletest (initial version )
| * | | | Added Copyrightmisterg2017-08-101-4/+31
| | | | |
| * | | | Initial Revision, review 164634031misterg2017-08-101-25/+0
| | | | |
| * | | | WIPmisterg2017-08-091-0/+25
| | | | |
| * | | | Added googlemock testsmisterg2017-08-091-4/+0
| | | | |
| * | | | Added googlemock testsmisterg2017-08-091-0/+29
| | | | |
* | | | | Merge pull request #1123 from chromy/upstream-141765019Gennadiy Civil2017-08-081-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix typo in gmock-actions.h
| * | | | | Fix typo in gmock-actions.hHector Dearman2017-06-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | This upstreams a Google-internal change (141765019).
* | | | | | Merge pull request #1122 from chromy/upstream-146491438Gennadiy Civil2017-08-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed misspelling in assertion message.
| * | | | | | Fixed misspelling in assertion message.Hector Dearman2017-06-191-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | This upstreams a Google-internal change (146491438).
* | | | | | Correct some typos in a commentShlomi Fish2017-08-041-1/+1
| | | | | |
* | | | | | Merge pull request #1042 from danilcha/patch-1Gennadiy Civil2017-08-021-3/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added description of how to silence clang pedantic warnings in Google Mock includes
| * | | | | | Again rewrote everythingdanilcha2017-03-121-12/+24
| | | | | | |
| * | | | | | Added explicit gtest library dependencydanilcha2017-03-121-1/+1
| | | | | | |
| * | | | | | Update README.mddanilcha2017-03-111-2/+2
| | | | | | |
| * | | | | | Update README.mddanilcha2017-03-111-3/+24
| | | | | | |
* | | | | | | Merge pull request #867 from marzojr/patch-1Gennadiy Civil2017-08-021-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Clarifying documentation language
| * | | | | | | Clarifying languageMarzo Sette Torres Junior2016-09-021-2/+3
| | |_|_|_|_|/ | |/| | | | | | | | | | | | The old language might mislead someone into thinking that the access level on the base class itself was changed.
* | | | | | | Merge pull request #764 from flyd1005/wip-fix-typoGennadiy Civil2017-08-023-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | remove duplicated words
| * | | | | | | remove duplicated wordsLi Peng2016-04-273-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Li Peng <lip@dtdream.com>
* | | | | | | | Merge pull request #998 from dawikur/patch-1Gennadiy Civil2017-08-021-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Replace html entities with their equivalents
| * | | | | | | Replace html entities with their equivalentsDawid Kurek2017-02-061-2/+2
| | | | | | | |
* | | | | | | | Merge pull request #1167 from krizalys/fix-typoGennadiy Civil2017-07-311-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixed typo
| * | | | | | | | Fixed typoChristophe Vidal2017-07-311-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
* / | | | | | | fix links to Google C++ Style GuideHerbert Thielen2017-07-302-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #1137 from coryan/masterGennadiy Civil2017-07-264-29/+41
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix table formatting.
| * | | | | | | More tables that did not render correctly.Carlos O'Ryan2017-07-014-1/+9
| | | | | | | |
| * | | | | | | Remove silly claim that C++ lacks lambdas.Carlos O'Ryan2017-07-014-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The document itself uses lambdas later, all the scaffolding to work around lack of lambdas should be considered for removal, but that is much larger an effort than I can commit to.
| * | | | | | | Same fixes for "current" version.Carlos O'Ryan2017-07-011-4/+5
| | | | | | | |
| * | | | | | | Fix typos too s/destoyed/destroyed/Carlos O'Ryan2017-07-013-6/+6
| | | | | | | |
| * | | | | | | Fix table formatting.Carlos O'Ryan2017-07-013-6/+9
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | The markdown was not working for a small table, fixed.
* | | | | | | docs: fix broken linkJose Nino2017-07-261-1/+1
| | | | | | |
* | | | | | | docs: fix broken link from dummies guide to cook bookJose Nino2017-06-191-1/+1
|/ / / / / /
* | | | / / Use std::string and ::string explicitly in gtest and gmock code.Nico Weber2017-05-1516-401/+406
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This merges a Google-internal change (117235625). Original CL description: This CL was created manually in about an hour with sed, a Python script to find all the places unqualified 'string' was mentioned, and some help from Emacs to add the "std::" qualifications, plus a few manual tweaks.
* | | | | Remove /tree/ from Readme.md links.Billy Donahue2017-02-251-4/+4
|/ / / / | | | | | | | | Issue #1028
* | | | Merge pull request #1 from google/masterSam Roth2017-01-233-2/+12
|\ \ \ \ | | | | | | | | | | Syncing my branch
| * \ \ \ Merge pull request #658 from audiofanatic/ExternalProject_at_configure_timeBilly Donahue2016-12-181-0/+10
| |\ \ \ \ | | | | | | | | | | | | Added docs for ExternalProject download during CMake step
| | * | | | Added CMake configure-time download instructions to docsCraig Scott2016-12-181-0/+10
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds instructions for how to add gtest and gmock to another CMake project directly. Downloading of the googletest sources happens as configure time, allowing it to be added to the main build directly via the add_subdirectory() command. This ensures googletest is built with the same compiler settings, etc. and will typically result in a more robust and more convenient build arrangement.
| * / | | 2.6.4 is the minimum CMake version, so enforce it (#656)Craig Scott2016-12-171-1/+1
| |/ / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 03:09:16 +0000