aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1781 from wfvining/fix1764-cmake-errorsGennadiy Civil2018-08-241-21/+0
|\ | | | | Fix #1764 Remove cmake code that leads to a configuration error
| * Fix #1764 Remove cmake code that leads to a configuration errorWill Vining2018-08-241-21/+0
|/ | | | | | This step is no longer necessary. The configuration given in the googletest README.md is sufficient to bring in all the googlemock headers.
* Update README.mdGennadiy Civil2018-08-241-1/+1
|
* Merge pull request #1767 from jschloss-swift/issue_1735Gennadiy Civil2018-08-241-1/+1
|\ | | | | Issue #1735 It seems like CMAKE_CXX_FLAGS is getting double appended when buildin…
| * Merge branch 'master' into issue_1735Gennadiy Civil2018-08-241-7/+7
| |\ | |/ |/|
* | Merge pull request #1779 from google/9A681768AABE08D1EFA5CA77528236A4Gennadiy Civil2018-08-231-7/+7
|\ \ | | | | | | Googletest export
| * | Googletest exportmisterg2018-08-231-7/+7
| | | | | | | | | | | | | | | | | | Remove unneeded check for NULL. Note: this started as OSS PR https://github.com/google/googletest/pull/967 but changed PiperOrigin-RevId: 209819732
| * | Googletest exportsrz_zumix2018-08-233-61/+23
| | | | | | | | | | | | | | | | | | Internal Change PiperOrigin-RevId: 209498445
| * | Googletest exportsrz_zumix2018-08-233-23/+61
|/ / | | | | | | | | | | Internal Change PiperOrigin-RevId: 209471987
| * Merge branch 'master' into issue_1735Jacob Schloss2018-08-22182-594/+620
| |\ | |/ |/|
* | Merge pull request #1338 from stefanosoffia/masterGennadiy Civil2018-08-226-178/+93
|\ \ | | | | | | Install CMake export files
| * | Install CMake export filesStefano Soffia2018-08-226-178/+93
|/ / | | | | | | Rework of the closed pull request #768
* | Merge pull request #1682 from dakotahawkins/improve-exported-targetsGennadiy Civil2018-08-214-20/+122
|\ \ | | | | | | Improve CMake exported targets
| * | Improve CMake exported targets.Dakota Hawkins2018-08-214-20/+122
|/ / | | | | | | | | | | | | | | | | | | | | I _think_ this represents some of the "best practices" for exporting targets. They'll be available in a `googletest::` namespace (e.g. `googletest::gmock`) with non-namespaced `ALIAS` targets. - Added GOOGLETEST_VERSION variable - Use `CMakePackageConfigHelpers`, bump minimum CMake version to 2.8.8 Signed-off-by: Dakota Hawkins <dakotahawkins@gmail.com>
* | Merge pull request #1194 from joshbodily/josh/fix_scoped_class2Gennadiy Civil2018-08-212-0/+21
|\ \ | | | | | | Fix scoped enum not working in gmock-gen.py
| * \ Merge branch 'master' into josh/fix_scoped_class2Gennadiy Civil2018-08-2023-40/+203
| |\ \ | |/ / |/| |
* | | Update CONTRIBUTING.mdGennadiy Civil2018-08-201-4/+5
| | |
* | | Merge pull request #1759 from gennadiycivil/masterGennadiy Civil2018-08-200-0/+0
|\ \ \ | | | | | | | | merge
| * \ \ mergeGennadiy Civil2018-08-2014-19/+70
| |\ \ \ | |/ / / |/| | |
* | | | googletest exportmisterg2018-08-2011-9/+63
| | | | | | | | | | | | | | | | | | | | | | | | - 209457654 Import of OSS PR, https://github.com/google/googletest/pu... by misterg <misterg@google.com> PiperOrigin-RevId: 209457654
* | | | googletest exportmisterg2018-08-203-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | - 209457486 Import of OSS PR, https://github.com/google/googletest/pu... by misterg <misterg@google.com> PiperOrigin-RevId: 209457486
| * | | Testing, adding a few line to sample4Gennadiy Civil2018-08-2013-532/+21
| | | |
| * | | Testing, adding to sample4 unittestGennadiy Civil2018-08-2010-0/+532
|/ / /
* | | Merge pull request #1754 from vkotovv/docs-advanced-broken-linksGennadiy Civil2018-08-201-5/+5
|\ \ \ | | | | | | | | docs: fixed broken references to sections in Advanced guide
| * | | docs: fix more broken links to sections in Advanced guideVadim Kotov2018-08-201-3/+3
| | | |
| * | | docs: fixed broken references to sections in Advanced guideVadim Kotov2018-08-201-2/+2
| | | |
* | | | Merge pull request #1120 from tanzislam/fix_death_test_child_mingw_wer_issue1116Gennadiy Civil2018-08-201-2/+2
|\ \ \ \ | |/ / / |/| | | Allow death test child to bypass Windows Error Reporting under MinGW
| * | | Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Gennadiy Civil2018-08-201-0/+17
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1347 from Burgch/fix-argcGennadiy Civil2018-08-191-0/+17
|\ \ \ \ | | | | | | | | | | Fix value pointed to by `_NSGetArgc()` on macOS.
| * \ \ \ Merge branch 'master' into fix-argcGennadiy Civil2018-08-193-8/+14
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | Minor formatting/style changesGennadiy Civil2018-08-171-8/+7
| | | | |
| * | | | Merge branch 'master' into fix-argcConor Burgess2018-08-17222-7276/+13402
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into fix-argcConor Burgess2018-02-1266-388/+1319
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into fix-argcConor Burgess2018-01-1284-917/+1031
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into fix-argcGennadiy Civil2017-12-084-1/+8
| |\ \ \ \ \ \ \
| * | | | | | | | Fix location of `_NSGetArgv` correction.Conor Burgess2017-12-071-10/+11
| | | | | | | | |
| * | | | | | | | Fix value pointed to by `_NSGetArgc()` on macOSConor Burgess2017-12-071-0/+16
| | | | | | | | |
| | | | | | * | | Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Gennadiy Civil2018-08-182-4/+10
| | | | | | |\ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Merge pull request #1612 from wkaluza/fix-msvc-d9025-warningGennadiy Civil2018-08-171-0/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove default /EHsc compiler flag
| * \ \ \ \ \ \ \ \ Merge branch 'master' into fix-msvc-d9025-warningGennadiy Civil2018-08-17203-3123/+3652
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Remove default /EHsc compiler flagWojciech Kaluza2018-07-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents warning D9025 (one command-line option overrides another) on MSVC builds: some test targets are built with the /EHs-c- which conflicts with /EHsc.
* | | | | | | | | | Merge pull request #1652 from medithe/patch-1Gennadiy Civil2018-08-171-4/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Cast the tr1::tuple_element template parameter to int
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into patch-1Gennadiy Civil2018-08-171-4/+4
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | FormattingGennadiy Civil2018-08-171-4/+5
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into patch-1Gennadiy Civil2018-08-176-15/+93
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'master' into patch-1Gennadiy Civil2018-08-15204-3409/+3903
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Cast the tr1::tuple_element template parameter to intmedithe2018-07-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because in `std::tr1::tuple_element` the first template parameter should be of type int (https://gcc.gnu.org/onlinedocs/libstdc++/libstdc++-html-USERS-4.4/a00547.html), but the code inserts a size_t, the first template parameter should be casted to int before, to get rid of the following errors: googletest-src/googletest/include/gtest/gtest-printers.h:957:60: error: conversion from ‘long unsigned int’ to ‘int’ may change value [-Werror=conversion] struct tuple_element : ::std::tr1::tuple_element<I, Tuple> {}; and googletest-src/googletest/include/gtest/gtest-printers.h:961:56: error: conversion from ‘long unsigned int’ to ‘int’ may change value [-Werror=conversion] const typename ::std::tr1::tuple_element<I, Tuple>::type>::type get(
| | | | | | | | | * | | Merge branch 'fix_death_test_child_mingw_wer_issue1116' of ↵Tanzinul Islam2018-08-180-0/+0
| | | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/tanzislam/googletest into fix_death_test_child_mingw_wer_issue1116
| | | | | | | | | | * \ \ Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Gennadiy Civil2018-08-16216-5507/+6416
| | | | | | | | | | |\ \ \
| | | | | | | | | * | \ \ \ Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Tanzinul Islam2018-08-17183-916/+1265
| | | | | | | | | |\ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-02 18:39:16 +0000