Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1160 from mwoehlke-kitware/honor-lib_suffix | Gennadiy Civil | 2017-08-11 | 1 | -4/+8 |
|\ | | | | | Fix library install destinations | ||||
| * | Fix library install destinationsrefs/pull/1160/head | Matthew Woehlke | 2017-08-09 | 1 | -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/sim | Gennadiy Civil | 2017-08-11 | 1 | -2/+2 |
|\ \ | | | | | | | Fix a few documentation nits in the mock dummies guide | ||||
| * | | Fix a few documentation nits in the mock dummies guiderefs/pull/957/head | Simon Glass | 2016-12-08 | 1 | -2/+2 |
| | | | | | | | | | | | | Add a hyphen to 'ad hoc' and change 'distance' to plural. | ||||
* | | | Merge pull request #1164 from aninf-wo/hethi/remove-old-docs | Gennadiy Civil | 2017-08-11 | 16 | -14883/+6 |
|\ \ \ | | | | | | | | | remove documentation of former versions - it's available in the commit history | ||||
| * | | | say "former version" instead of "released version"refs/pull/1164/head | Herbert Thielen | 2017-08-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into hethi/remove-old-docs | Herbert Thielen | 2017-08-09 | 9 | -18/+52 |
| |\ \ \ | |||||
| * | | | | remove doc of former versions | Herbert Thielen | 2017-07-30 | 15 | -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 manual | Herbert Thielen | 2017-07-30 | 1 | -3/+6 |
| | | | | | |||||
* | | | | | Merge pull request #1192 from eduherminio/master | Gennadiy Civil | 2017-08-11 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Minor style fixes | ||||
| * | | | | | Minor style fixesrefs/pull/1192/head | Eduardo Caceres | 2017-08-10 | 1 | -1/+1 |
| | |/ / / | |/| | | | | | | | | Typos, punctuation & broken links | ||||
* | | | | | Merge pull request #1191 from gennadiycivil/master | Gennadiy Civil | 2017-08-11 | 1 | -0/+52 |
|\ \ \ \ \ | |/ / / / |/| | | | | Adding Bazel build to googletest (initial version ) | ||||
| * | | | | Added Copyright | misterg | 2017-08-10 | 1 | -4/+31 |
| | | | | | |||||
| * | | | | Initial Revision, review 164634031 | misterg | 2017-08-10 | 1 | -25/+0 |
| | | | | | |||||
| * | | | | WIPrefs/pull/1190/head | misterg | 2017-08-09 | 1 | -0/+25 |
| | | | | | |||||
| * | | | | Added googlemock tests | misterg | 2017-08-09 | 1 | -4/+0 |
| | | | | | |||||
| * | | | | Added googlemock tests | misterg | 2017-08-09 | 1 | -0/+29 |
| | | | | | |||||
* | | | | | Merge pull request #1123 from chromy/upstream-141765019 | Gennadiy Civil | 2017-08-08 | 1 | -4/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix typo in gmock-actions.h | ||||
| * | | | | | Fix typo in gmock-actions.hrefs/pull/1123/head | Hector Dearman | 2017-06-19 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | This upstreams a Google-internal change (141765019). | ||||
* | | | | | | Merge pull request #1122 from chromy/upstream-146491438 | Gennadiy Civil | 2017-08-08 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixed misspelling in assertion message. | ||||
| * | | | | | | Fixed misspelling in assertion message.refs/pull/1122/head | Hector Dearman | 2017-06-19 | 1 | -1/+1 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | This upstreams a Google-internal change (146491438). | ||||
* | | | | | | Correct some typos in a commentrefs/pull/1173/head | Shlomi Fish | 2017-08-04 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #1042 from danilcha/patch-1 | Gennadiy Civil | 2017-08-03 | 1 | -3/+36 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Added description of how to silence clang pedantic warnings in Google Mock includes | ||||
| * | | | | | | Again rewrote everythingrefs/pull/1042/head | danilcha | 2017-03-12 | 1 | -12/+24 |
| | | | | | | | |||||
| * | | | | | | Added explicit gtest library dependency | danilcha | 2017-03-12 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Update README.md | danilcha | 2017-03-11 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Update README.md | danilcha | 2017-03-11 | 1 | -3/+24 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #867 from marzojr/patch-1 | Gennadiy Civil | 2017-08-02 | 1 | -2/+3 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Clarifying documentation language | ||||
| * | | | | | | | Clarifying languagerefs/pull/867/head | Marzo Sette Torres Junior | 2016-09-02 | 1 | -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-typo | Gennadiy Civil | 2017-08-02 | 3 | -3/+3 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | remove duplicated words | ||||
| * | | | | | | | remove duplicated wordsrefs/pull/764/head | Li Peng | 2016-04-27 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Li Peng <lip@dtdream.com> | ||||
* | | | | | | | | Merge pull request #998 from dawikur/patch-1 | Gennadiy Civil | 2017-08-02 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | Replace html entities with their equivalents | ||||
| * | | | | | | | Replace html entities with their equivalentsrefs/pull/998/head | Dawid Kurek | 2017-02-06 | 1 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #1167 from krizalys/fix-typo | Gennadiy Civil | 2017-07-31 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fixed typo | ||||
| * | | | | | | | | Fixed typorefs/pull/1167/head | Christophe Vidal | 2017-07-31 | 1 | -1/+1 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | fix links to Google C++ Style Guiderefs/pull/1165/head | Herbert Thielen | 2017-07-30 | 2 | -2/+2 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #1137 from coryan/master | Gennadiy Civil | 2017-07-26 | 4 | -29/+41 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix table formatting. | ||||
| * | | | | | | | More tables that did not render correctly.refs/pull/1137/head | Carlos O'Ryan | 2017-07-02 | 4 | -1/+9 |
| | | | | | | | | |||||
| * | | | | | | | Remove silly claim that C++ lacks lambdas. | Carlos O'Ryan | 2017-07-01 | 4 | -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'Ryan | 2017-07-01 | 1 | -4/+5 |
| | | | | | | | | |||||
| * | | | | | | | Fix typos too s/destoyed/destroyed/ | Carlos O'Ryan | 2017-07-01 | 3 | -6/+6 |
| | | | | | | | | |||||
| * | | | | | | | Fix table formatting. | Carlos O'Ryan | 2017-07-01 | 3 | -6/+9 |
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | The markdown was not working for a small table, fixed. | ||||
* | | | | | | | docs: fix broken linkrefs/pull/1158/head | Jose Nino | 2017-07-26 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | docs: fix broken link from dummies guide to cook bookrefs/pull/1126/head | Jose Nino | 2017-06-19 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Use std::string and ::string explicitly in gtest and gmock code.refs/pull/1089/head | Nico Weber | 2017-05-15 | 16 | -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.refs/pull/1029/head | Billy Donahue | 2017-02-26 | 1 | -4/+4 |
|/ / / / | | | | | | | | | Issue #1028 | ||||
* | | | | Merge pull request #1 from google/masterrefs/pull/874/head | Sam Roth | 2017-01-23 | 3 | -2/+12 |
|\ \ \ \ | | | | | | | | | | | Syncing my branch | ||||
| * \ \ \ | Merge pull request #658 from audiofanatic/ExternalProject_at_configure_time | Billy Donahue | 2016-12-18 | 1 | -0/+10 |
| |\ \ \ \ | | | | | | | | | | | | | Added docs for ExternalProject download during CMake step | ||||
| | * | | | | Added CMake configure-time download instructions to docsrefs/pull/658/head | Craig Scott | 2016-12-17 | 1 | -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 Scott | 2016-12-18 | 1 | -1/+1 |
| |/ / / |