Jacob Schloss
d4c984e4a8
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
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
Gennadiy Civil
cb6ebfcbd3
Merge branch 'master' into cross-testing-patch-1
2018-08-13 11:38:32 -07: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
Gennadiy Civil
169aaeb330
Merge branch 'master' of github.com:gennadiycivil/googletest
2018-08-09 11:54:12 -04:00
Gennadiy Civil
cd93ce867e
Fixing identation, causes build errors when warnings are treated as errors
2018-08-09 11:53:45 -04:00
Gennadiy Civil
1d1b1faf99
Update gtest-death-test.cc
2018-08-09 11:33:42 -04:00
Gennadiy Civil
4a3b4223c0
Merge branch 'master' of https://github.com/google/googletest
2018-08-09 11:12:41 -04:00
Gennadiy Civil
6de6cc88c0
Fixing identation, causes build errors when warnings are treated as errors
2018-08-09 11:12:12 -04:00
Gennadiy Civil
fbdccdd8ca
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
9b86cba84b
Merge branch 'master' of github.com:gennadiycivil/googletest
2018-08-09 10:52:09 -04:00
Gennadiy Civil
509653b8f6
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
52d39c2417
docs: fix broken links
2018-08-09 13:14:36 +02:00
Gennadiy Civil
6ef0a787b4
Merge pull request #1714 from gennadiycivil/master
...
Formatting tweaks, no functionality changes
2018-08-08 12:47:02 -07:00
Gennadiy Civil
caf4239ac1
Merge branch 'master' into master
2018-08-08 12:19:55 -07:00
Gennadiy Civil
d47d12522a
Merge branch 'master' into cross-testing-patch-1
2018-08-08 12:19:04 -07:00
Gennadiy Civil
aaa6bb6030
Formatting tweaks, no functionality changes
2018-08-08 15:14:21 -04:00
Gennadiy Civil
a1fefcecef
Merge pull request #1713 from gennadiycivil/master
...
code management changes, no functionalty changes
2018-08-08 11:41:59 -07:00
Gennadiy Civil
ced597d723
code management changes, no functionalty changes
2018-08-08 14:41:21 -04:00
Gennadiy Civil
b890b8dd43
Merge pull request #1710 from gennadiycivil/master
...
Formatting Changes and small code merge
2018-08-08 10:34:21 -07:00
Gennadiy Civil
c27211e354
Merge branch 'master' of github.com:gennadiycivil/googletest
2018-08-08 13:22:10 -04:00
Gennadiy Civil
f25067ba5e
Formatting Changes and small code merge
2018-08-08 13:21:45 -04:00
Gennadiy Civil
6c096eca85
Merge branch 'master' of https://github.com/google/googletest
2018-08-08 13:20:34 -04:00
Gennadiy Civil
0f786969af
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
6d90de75bb
Merge pull request #1708 from drwez/fixFuchsia
...
Fix typo breaking Fuchsia build.
2018-08-08 08:58:22 -07:00
Wez
bc18a32b2b
Fix typo breaking Fuchsia build
2018-08-07 16:53:10 -07:00