Commit Graph

2138 Commits

Author SHA1 Message Date
Gennadiy Civil
0489d80590 Merge branch 'master' into cleanup-cmake 2018-08-15 13:02:54 -07:00
Gennadiy Civil
8fd9e79357 Merge pull request #1697 from morris-stock/ignore-cmake-generated-files
Ignore cmake generated files when used as submodule
2018-08-15 11:39:13 -07:00
Gennadiy Civil
644d7c7ca2 Merge branch 'master' into ignore-cmake-generated-files 2018-08-15 10:17:09 -07:00
Gennadiy Civil
62b3e33a36 Merge pull request #1734 from eliasdaler/cmake-binary-dir-fix
Change location of pkg-config files from CMAKE_BINARY_DIR to gmock/gtest_BINARY_DIR
2018-08-15 08:26:25 -07:00
Gennadiy Civil
5b38636cb1 Merge branch 'master' into cmake-binary-dir-fix 2018-08-14 14:25:05 -07:00
Gennadiy Civil
b0c36ac06d Merge pull request #1741 from gennadiycivil/master
Comments changes, no functionality changes.
2018-08-14 14:24:01 -07:00
Gennadiy Civil
ea90e723e0 more comments changes 2018-08-14 16:05:55 -04:00
Gennadiy Civil
1564048f79 Merge branch 'master' into cmake-binary-dir-fix 2018-08-14 12:55:13 -07:00
Gennadiy Civil
d2e8f7c999 more comments changes 2018-08-14 15:45:00 -04:00
Gennadiy Civil
f0bcc9b875 Comments changes, no functionality changes. 2018-08-14 15:04:11 -04:00
Gennadiy Civil
5efd6a4279 Merge pull request #1740 from gennadiycivil/master
Comments changes, no functionality changes
2018-08-14 11:18:43 -07:00
Gennadiy Civil
bdc777e251 Comments changes, no functionality changes 2018-08-14 14:04:07 -04:00
Gennadiy Civil
a78532ec2f Merge pull request #1665 from rongjiecomputer/deprecate
Disable MSVC function deprecation when using Clang
2018-08-14 10:48:11 -07:00
Gennadiy Civil
23c6b5b54e Merge branch 'master' into deprecate 2018-08-14 08:47:13 -07:00
Gennadiy Civil
c51ba73c5c Merge pull request #1738 from gennadiycivil/master
Code formatting changes, clean up, no functionality changes
2018-08-14 08:21:59 -07:00
Gennadiy Civil
175032a9e8 Code formatting changes, clean up, no functionality changes 2018-08-14 11:08:35 -04:00
Gennadiy Civil
3642904c07 Merge pull request #1733 from gennadiycivil/master
Move instructions into custom/README files
2018-08-14 07:55:28 -07:00
Gennadiy Civil
dc6b2a66fb Merge branch 'master' into master 2018-08-14 07:42:41 -07:00
Gennadiy Civil
b0f2daec87 formatting custom/README.md 2018-08-13 22:45:53 -04:00
Gennadiy Civil
5bdf9c5f70 formatting for new READMEs 2018-08-13 16:23:17 -04:00
Gennadiy Civil
5b27936c4b Merge pull request #924 from wind-river-cdt/cross-testing-patch-1
Fix #923 - support CMAKE_CROSSCOMPILING_EMULATOR for tests
2018-08-13 13:20:07 -07:00
Elias Daler
5d4126e1c4 Change location of generated pkg-config files from CMAKE_BINARY_DIR to gmock/gtest_BINARY_DIR (#1717) 2018-08-13 23:01:09 +03:00
Gennadiy Civil
cb6ebfcbd3 Merge branch 'master' into cross-testing-patch-1 2018-08-13 11:38:32 -07:00
Gennadiy Civil
14c85e4300 Merge branch 'master' of https://github.com/google/googletest 2018-08-13 14:32:06 -04:00
Gennadiy Civil
14e8a3161d Move instructions into custom/README files 2018-08-13 14:31:56 -04:00
Gennadiy Civil
c10c13ae13 Merge pull request #1732 from gennadiycivil/master
comment cleanup
2018-08-13 10:18:11 -07:00
Gennadiy Civil
d61ffe1c3f comment cleanup 2018-08-13 13:17:38 -04:00
Gennadiy Civil
09f590ec76 Merge pull request #1731 from 2power10/master
Fix the bad format issues in docs/advanced.md
2018-08-13 07:26:29 -07:00
Yi Zheng
7c8c23717e - Fix the broken markdown table
- Fix some format issue
2018-08-13 17:57:51 +08:00
Gennadiy Civil
a6533dda5d Merge pull request #1727 from gennadiycivil/master
Mode change on a python script
2018-08-10 13:09:36 -07:00
Gennadiy Civil
af497af914 Mode change on a python script 2018-08-10 15:42:16 -04:00
Gennadiy Civil
442128feda Update README.md 2018-08-10 15:20:51 -04:00
Gennadiy Civil
e3c8ef7855 Merge pull request #1726 from google/gennadiycivil-patch-2
Feature forward plans -  README.md
2018-08-10 12:20:10 -07:00
Gennadiy Civil
00f3d86704 Update README.md 2018-08-10 12:05:17 -04:00
Gennadiy Civil
bcf1b333f4 Update README.md 2018-08-10 11:30:04 -04:00
Gennadiy Civil
80f3ec244f Update README.md 2018-08-10 11:29:18 -04:00
Gennadiy Civil
7438020fac Update README.md 2018-08-10 11:06:52 -04:00
Gennadiy Civil
5ec0b6b907 Update README.md 2018-08-10 10:59:52 -04:00
Gennadiy Civil
463d117a6e Merge pull request #1725 from google/gennadiycivil-patch-1
Update gmock_output_test.py, formatting
2018-08-09 12:54:07 -07:00
Gennadiy Civil
97eced2f22 Update gmock_output_test.py 2018-08-09 15:24:43 -04:00
Gennadiy Civil
ad1c3931e2 Merge pull request #1719 from happyCoder92/master
docs: fix broken links
2018-08-09 10:54:09 -07:00
Gennadiy Civil
dd9c56c309 Merge pull request #1724 from gennadiycivil/master
formatting and small changes related to code management
2018-08-09 10:53:58 -07:00
Gennadiy Civil
78f366819f Merge branch 'master' into master 2018-08-09 10:40:06 -07:00
Gennadiy Civil
24008ff6d5 Merge branch 'master' of https://github.com/google/googletest 2018-08-09 13:37:27 -04:00
Gennadiy Civil
fc612ccfe1 formatting and small changes related to code management, no functionality changes 2018-08-09 13:37:11 -04:00
Gennadiy Civil
08fc2c63ac Merge pull request #1723 from gennadiycivil/master
code management comments,
2018-08-09 09:23:00 -07:00
Gennadiy Civil
2a80e0269a Merge branch 'master' into master 2018-08-09 09:22:40 -07:00
Gennadiy Civil
b0ccde3526 code management comments, [ci-skip], no functionality changes 2018-08-09 12:21:49 -04:00
Gennadiy Civil
f68c6ca928 Merge pull request #1721 from gennadiycivil/master
Fixing identation, causes build errors when warnings are treated as errors
2018-08-09 09:11:18 -07:00
Gennadiy Civil
d856aacd88 Fixing identation, causes build errors when warnings are treated as errors 2018-08-09 11:55:48 -04:00