162 Commits

Author SHA1 Message Date
Gennadiy Civil
34a79744f1 Merge branch 'master' into master 2017-08-23 14:27:55 -04:00
Arkady Shapkin
40e2b2f67d Support x64 configuration for old VS2010 projects
VS2010 solution only to simplify old users (who used these solutions) upgrading to new gtest/gmock, new users should use CMake generated solutions. VS2010 solution can be opened in any new VS.
2017-08-23 01:45:44 +03:00
drgler
57bd507b1f Merge branch 'master' of github.com:Dani-Hub/googletest 2017-08-22 21:13:32 +02:00
drgler
0654fb095d Merge branch 'master' of github.com:Dani-Hub/googletest 2017-08-22 20:18:54 +02:00
Daniel Krügler
71b9b22dd6 Merge branch 'master' into master 2017-08-21 20:14:09 +02:00
Henry Schreiner
3a31c6b4f4 Adding CMake visibility policy setting
This policy setting will silence a warning when using with a visibility settings on targets. Due to the forced `cmake_minimum_version`, policy settings in CMakeLists calling this one (including the main CMakeLists) are lost, forcing the change to be made here.
2017-08-18 15:18:58 -04:00
David Seifert
70c8a8e0bd Add documentation for pkg-config 2017-08-14 13:45:56 +02:00
David Seifert
a3ab075319 Add support for pkgconfig 2017-08-14 13:45:56 +02:00
Gennadiy Civil
be0f3823ba Merge pull request #905 from iignatev/master
enable null detection on Solaris Studio 12u4+
2017-08-13 21:34:10 -04:00
Gennadiy Civil
17af07aed9 Merge pull request #1160 from mwoehlke-kitware/honor-lib_suffix
Fix library install destinations
2017-08-11 09:14:49 -04:00
Gennadiy Civil
240309b6a2 Merge pull request #871 from tommyleo2/master
Update Primer.md
2017-08-10 21:34:15 -04:00
Gennadiy Civil
db1a847416 Merge pull request #937 from srz-zumix/fix-gtest-port-typo
Fix or condition typo ( '|' -> '||' )
2017-08-10 21:30:13 -04:00
Gennadiy Civil
6c8b263997 Merge pull request #1164 from aninf-wo/hethi/remove-old-docs
remove documentation of former versions - it's available in the commit history
2017-08-10 21:19:03 -04:00
Gennadiy Civil
4da1d9769d Merge pull request #1127 from zulkarnine/patch-1
Fix background color in ColoredPrintf
2017-08-10 20:43:26 -04:00
Gennadiy Civil
664a703c70 Merge pull request #1192 from eduherminio/master
Minor style fixes
2017-08-10 20:36:29 -04:00
Gennadiy Civil
26a5d30ac0 Merge pull request #1191 from gennadiycivil/master
Adding Bazel build to googletest (initial version )
2017-08-10 20:35:27 -04:00
misterg
f326bd27b2 Addressing Comments 2017-08-10 16:33:22 -04:00
drgler
0d121065b4 Merge branch 'master' of github.com:Dani-Hub/googletest 2017-08-10 21:18:22 +02:00
Herbert Thielen
89bd69dff5 say "former version" instead of "released version" 2017-08-10 20:21:46 +02:00
Eduardo Caceres
fccdf51ece Minor style fixes
Typos, punctuation & broken links
2017-08-10 18:05:32 +02:00
misterg
4d386daead Added Copyright 2017-08-10 12:03:27 -04:00
misterg
a7b338585e Initial Revision, review 164634031 2017-08-10 11:54:46 -04:00
Gennadiy Civil
d47ef4b7dc Merge pull request #1178 from aninf-wo/hethi/testsuite-hint
add note about different definitions of Test Case
2017-08-10 09:13:45 -04:00
Herbert Thielen
23c3feba97 clarify distinction regarding Test Case 2017-08-10 10:08:08 +02:00
Matthew Woehlke
92b6ea3c94 Fix library install destinations
Modify library install destinations to install .dll's to the correct
location (`bin`, not `lib`), and to install other artifacts to the
correct platform-dependent location by using GNUInstallDirs. This is
required for some distributions (e.g. Fedora) and will fix an issue that
otherwise requires those distributions to patch the upstream sources.
Also, add options to suppress installation, which may be useful for
projects that embed Google Test.

Since Google Test is trying to support archaic versions of CMake, a
brain-dead fallback (which requires that the user set either LIB_SUFFIX
or CMAKE_INSTALL_LIBDIR themselves) is included for versions that
predate GNUInstallDirs.

Fixes #1161.

Co-Authored-By: d3x0r <d3x0r@users.noreply.github.com>
2017-08-09 15:29:36 -04:00
drgler
ec538fc0b8 Infinite Loop when calling a mock function that takes boost::filesystem::path as parameter #521: Add is_same type trait and prevent infinite loops for recursive containers 2017-08-09 19:08:22 +02:00
drgler
635ccb98a7 Infinite Loop when calling a mock function that takes boost::filesystem::path as parameter #521: Add is_same type trait 2017-08-09 19:07:22 +02:00
misterg
dd94055b01 WIP 2017-08-09 11:47:54 -04:00
Herbert Thielen
646ebe5ad5 be more specific on Test Case 2017-08-09 16:41:38 +02:00
Eduardo Cáceres
bd84341086 Punctuation
Missing periods
2017-08-09 14:10:23 +02:00
Herbert Thielen
fc59509590 Merge branch 'master' into hethi/remove-old-docs 2017-08-09 11:03:27 +02:00
misterg
3ea266427c WIP, win testing 2017-08-08 15:54:36 -04:00
misterg
5b99572967 WIP, windows testing 2017-08-08 15:37:38 -04:00
misterg
96a7912d63 WIP, windows testing 2017-08-08 15:34:40 -04:00
misterg
bc27e2643a WIP, windows testing 2017-08-08 15:32:30 -04:00
misterg
071e87fbcc WIP 2017-08-08 15:17:56 -04:00
Gennadiy Civil
f9f759c7b6 Merge pull request #675 from theHacker/master
Fix: Markdown in V1_7_Primer.md
2017-08-08 11:53:40 -04:00
Gennadiy Civil
e016e565a7 Merge pull request #909 from AsturaPhoenix/patch-1
Update Primer.md
2017-08-07 23:01:42 -04:00
Gennadiy Civil
01d23ced95 Merge pull request #1180 from aconverse/master
Use wider types to prevent unsigned overflow diagnostics
2017-08-07 15:37:15 -04:00
misterg
926d53898a Samples changes upstreaming 2017-08-07 13:25:03 -04:00
misterg
2c54f2bb44 Samples changes upstreaming 2017-08-07 13:20:57 -04:00
Herbert Thielen
16e8218b47 add note about different definitions of Test Case
There are contradictory definitions of the term "test case", so prepare
new users in Primer.md to avoid confusion.
2017-08-05 15:12:12 +02:00
Herbert Thielen
8dd8fb0e4a fix small typo in comment 2017-08-05 12:42:00 +02:00
Alex Converse
be0d00e733 Use wider types to prevent unsigned overflow diagnostics
The rest of the (covered) codebase is already integer overflow clean.
This is a cherry-pick of an internal change.

TESTED=gtest_shuffle_test goes from fail to pass with -fsanitize=integer
2017-08-03 14:12:25 -07:00
Gennadiy Civil
04e2d9246e Merge pull request #1030 from vpfautz/master
Fixed some typos
2017-08-03 16:49:13 -04:00
Gennadiy Civil
e51a2f1ab1 Merge pull request #671 from mehagar/patch-1
Fix typo in AdvancedGuide.md
2017-08-02 17:07:27 -04:00
Gennadiy Civil
b3226d86bc Merge pull request #764 from flyd1005/wip-fix-typo
remove duplicated words
2017-08-02 17:04:33 -04:00
Gennadiy Civil
844e7f6bb6 Merge pull request #962 from klimkin/klimkin-patch-typo
Fix a typo
2017-08-02 16:55:50 -04:00
Gennadiy Civil
2386922e9d Merge pull request #968 from nicolacavallini/link_typed_test_docs
added link to sample 6 in the  documentation of typed test
2017-08-02 16:45:13 -04:00
misterg
30ff155152 WIP 2017-08-01 14:36:29 -04:00