aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Changing clang tp 3.9 as 3.7 no longer works on TravisGennadiy Civil2018-08-291-2/+2
|
* Changing clang tp 3.9 as 3.7 no longer works on TravisGennadiy Civil2018-08-293-3/+3
|
* Merge pull request #1794 from BlueMonday/patch-1Gennadiy Civil2018-08-291-1/+1
|\ | | | | Fix broken FAQ link in primer.md
| * Fix broken FAQ link in primer.mdSteven Santos Erenst2018-08-281-1/+1
|/ | | The current link pointed to a non existing section in the FAQ.
* Merge pull request #1784 from DavidSchuldenfrei/add-adapter-to-readmeGennadiy Civil2018-08-271-0/+2
|\ | | | | New Readme.md
| * New Readme.mdDavid Schuldenfrei2018-08-271-0/+2
|/
* Merge pull request #1769 from dakotahawkins/fix-1764_CMake-errors-in-googlemockGennadiy Civil2018-08-272-4/+4
|\ | | | | Use `$<INSTALL_PREFIX>` in `target_include_directories`
| * Merge branch 'master' into fix-1764_CMake-errors-in-googlemockGennadiy Civil2018-08-277-109/+387
| |\ | |/ |/|
* | Update CONTRIBUTING.mdGennadiy Civil2018-08-271-2/+1
| |
* | Merge 72a2836945e7a3dcee0730166704587e10bf64ee into ↵David Schuldenfrei2018-08-274-73/+333
| | | | | | | | | | | | | | | | | | | | 1d9a1912e7f42e8ae66ea365b5b8508fecb31509 Closes #1658 Review and changes, mister@google.com PiperOrigin-RevId: 210374286
* | No longer require a functor passed to ResultOf matcher to define `result_of` ↵Abseil Team2018-08-272-34/+53
| | | | | | | | | | | | | | | | | | type. This makes ResultOf more convenient to use. In particular, the matcher now accepts lambdas. PiperOrigin-RevId: 210118509
| * Use `$<INSTALL_PREFIX>` in `target_include_directories`Dakota Hawkins2018-08-242-4/+4
|/ | | | | | | | | | | | | | | To make sure packages are relocatable, use `$<INSTALL_PREFIX>` in `$<INSTALL_INTERFACE:...>` `target_include_directories`. `$<INSTALL_PREFIX>` was introduced in CMake 2.8.11, which is already being checked for locally. References: - https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#id19 - https://github.com/robotology/how-to-export-cpp-library/blob/claudio/headeronly/src/LibTemplateCMake/CMakeLists.txt#L42 Signed-off-by: Dakota Hawkins <dakotahawkins@gmail.com>
* 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
| | | | | | |\ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-30 20:43:04 +0000