Jacob Schloss
6e79801645
It seems like CMAKE_CXX_FLAGS is getting double appended when building as a nested cmake project,
...
which breaks my build as gcc does not allow -specs=nosys.specs to be called multiple times.
Removing this fixes it and seems to keep the same compile options, just removing the duplicate definition.
2018-08-22 11:17:32 -07:00
Gennadiy Civil
8bc11c040a
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
Gennadiy Civil
47b57ff1b2
Merge branch 'master' into cross-testing-patch-1
2018-08-13 11:38:32 -07:00
Gennadiy Civil
7800ba3eea
Merge pull request #1732 from gennadiycivil/master
...
comment cleanup
2018-08-13 10:18:11 -07:00
Gennadiy Civil
18c940d13a
comment cleanup
2018-08-13 13:17:38 -04:00
Gennadiy Civil
65b42fa615
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
ecc241900a
- Fix the broken markdown table
...
- Fix some format issue
2018-08-13 17:57:51 +08:00
Gennadiy Civil
ae94a9097d
Merge pull request #1727 from gennadiycivil/master
...
Mode change on a python script
2018-08-10 13:09:36 -07:00
Gennadiy Civil
390a6b7932
Mode change on a python script
2018-08-10 15:42:16 -04:00
Gennadiy Civil
8cccb2a718
Update README.md
2018-08-10 15:20:51 -04:00
Gennadiy Civil
9cb381952e
Merge pull request #1726 from google/gennadiycivil-patch-2
...
Feature forward plans - README.md
2018-08-10 12:20:10 -07:00
Gennadiy Civil
b1236528fe
Update README.md
2018-08-10 12:05:17 -04:00
Gennadiy Civil
77ac31c35f
Update README.md
2018-08-10 11:30:04 -04:00
Gennadiy Civil
4de527dc2c
Update README.md
2018-08-10 11:29:18 -04:00
Gennadiy Civil
945618b202
Update README.md
2018-08-10 11:06:52 -04:00
Gennadiy Civil
e821a2db23
Update README.md
2018-08-10 10:59:52 -04:00
Gennadiy Civil
6b6be9457b
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
5eb263569b
Update gmock_output_test.py
2018-08-09 15:24:43 -04:00
Gennadiy Civil
b46b86ee60
Merge pull request #1719 from happyCoder92/master
...
docs: fix broken links
2018-08-09 10:54:09 -07:00
Gennadiy Civil
6b89cb06a7
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
4e13415ff4
Merge branch 'master' into master
2018-08-09 10:40:06 -07:00
Gennadiy Civil
640556f9e5
Merge branch 'master' of https://github.com/google/googletest
2018-08-09 13:37:27 -04:00
Gennadiy Civil
acaf5beacc
formatting and small changes related to code management, no functionality changes
2018-08-09 13:37:11 -04:00
Gennadiy Civil
4843eafd9e
Merge pull request #1723 from gennadiycivil/master
...
code management comments,
2018-08-09 09:23:00 -07:00
Gennadiy Civil
71c2bb4a97
Merge branch 'master' into master
2018-08-09 09:22:40 -07:00
Gennadiy Civil
4d9411467d
code management comments, [ci-skip], no functionality changes
2018-08-09 12:21:49 -04:00
Gennadiy Civil
33596cb5c3
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
7a79459a66
Fixing identation, causes build errors when warnings are treated as errors
2018-08-09 11:55:48 -04:00
Gennadiy Civil
54cb8b0238
Merge branch 'master' of github.com:gennadiycivil/googletest
2018-08-09 11:54:12 -04:00
Gennadiy Civil
f7042937af
Fixing identation, causes build errors when warnings are treated as errors
2018-08-09 11:53:45 -04:00
Gennadiy Civil
d5b31df900
Update gtest-death-test.cc
2018-08-09 11:33:42 -04:00
Gennadiy Civil
9faeadedf4
Merge branch 'master' of https://github.com/google/googletest
2018-08-09 11:12:41 -04:00
Gennadiy Civil
ecc6944fb1
Fixing identation, causes build errors when warnings are treated as errors
2018-08-09 11:12:12 -04:00
Gennadiy Civil
2797ba8f91
Merge pull request #1720 from gennadiycivil/master
...
Formatting change for auto code management, no functionality changes
2018-08-09 07:53:26 -07:00
Gennadiy Civil
3d167fde42
Merge branch 'master' of github.com:gennadiycivil/googletest
2018-08-09 10:52:09 -04:00
Gennadiy Civil
063a90b391
Formatting change for auto code management, no functionality changes
...
Merge branch 'master' of https://github.com/google/googletest
2018-08-09 10:51:49 -04:00
Wiktor Garbacz
db43df6df7
docs: fix broken links
2018-08-09 13:14:36 +02:00
Gennadiy Civil
4de57ce787
Merge pull request #1714 from gennadiycivil/master
...
Formatting tweaks, no functionality changes
2018-08-08 12:47:02 -07:00
Gennadiy Civil
541eeb4b40
Merge branch 'master' into master
2018-08-08 12:19:55 -07:00
Gennadiy Civil
11f5a2740a
Merge branch 'master' into cross-testing-patch-1
2018-08-08 12:19:04 -07:00
Gennadiy Civil
00fc0d24d1
Formatting tweaks, no functionality changes
2018-08-08 15:14:21 -04:00
Gennadiy Civil
66bd580b5b
Merge pull request #1713 from gennadiycivil/master
...
code management changes, no functionalty changes
2018-08-08 11:41:59 -07:00
Gennadiy Civil
0eeb1afcac
code management changes, no functionalty changes
2018-08-08 14:41:21 -04:00
Gennadiy Civil
61799bd500
Merge pull request #1710 from gennadiycivil/master
...
Formatting Changes and small code merge
2018-08-08 10:34:21 -07:00
Gennadiy Civil
d31266e4ec
Merge branch 'master' of github.com:gennadiycivil/googletest
2018-08-08 13:22:10 -04:00
Gennadiy Civil
35e1959125
Formatting Changes and small code merge
2018-08-08 13:21:45 -04:00
Gennadiy Civil
d5d335b1d0
Merge branch 'master' of https://github.com/google/googletest
2018-08-08 13:20:34 -04:00
Gennadiy Civil
bdf5fd3a98
Merge branch 'master' of https://github.com/google/googletest
...
Formatting changes and code sync
Merge branch 'master' of https://github.com/google/googletest
2018-08-08 13:20:02 -04:00
Gennadiy Civil
d526632675
Merge pull request #1708 from drwez/fixFuchsia
...
Fix typo breaking Fuchsia build.
2018-08-08 08:58:22 -07:00
Wez
07d45437f2
Fix typo breaking Fuchsia build
2018-08-07 16:53:10 -07:00
