Bernhard Bauer
a92c362cfb
Merge branch 'master' into 2017_09_04_parametrized
2017-09-06 11:25:46 +01:00
Gennadiy Civil
857ddeadeb
Merge pull request #975 from LebedevRI/respect-option
...
CMake: use threads if allowed and found, not just if found.
2017-09-05 13:07:37 -04:00
Bernhard Bauer
86e5f0083e
Add a non-parametrized test.
2017-09-04 15:46:31 +01:00
Bernhard Bauer
e7c9e80e63
Allow macros inside of parametrized test names.
...
This allows doing things like TEST_P(TestFixture, MAYBE(TestName)) for nicer conditional test disabling.
2017-09-04 15:46:31 +01:00
Roman Lebedev
1a62d1b088
CMake: use threads if allowed and found, not just if found.
...
If the user's cmakelists.txt first look for threads using
find_package(Threads), then set(gtest_disable_pthreads ON),
and then include googletest. GoogleTest will not look for
threads. But since they have already been found before in
user's cmakelists, it will use them regardless.
This helped me fix build issue in darktable-org/rawspeed
on windows/MSYS2, even though there are threads, and they
are usable, googletest build was failing with issues
about AutoHandle. I was first looking for threads, and only
then including googletest, so no matter the value of
gtest_disable_pthreads, it failed.
The other obvious solution is for user to first include
googletest, and only then look for threads by himself.
2017-09-01 21:02:59 +03:00
Gennadiy Civil
52b6ca3428
Merge pull request #783 from tobbi/cppcheck_perf_fixes
...
Performance fixes reported by cppcheck
2017-09-01 13:52:33 -04:00
Gennadiy Civil
e4f6c0b358
Merge pull request #1011 from zeitounator/wrong-version-reported
...
Wrong version reported (1.7.0 should be 1.8.0)
2017-09-01 13:38:26 -04:00
Gennadiy Civil
b3a1f87f0c
Merge pull request #1235 from aninf-wo/hethi/issue-1175-cmake-build-type
...
use cmake build type defined in .travis.yml for travis builds
2017-09-01 10:07:43 -04:00
Gennadiy Civil
836c194a81
Merge pull request #1241 from aninf-wo/hethi/issue-635-old-links
...
change links from former code.google.com to current github repository
2017-08-31 18:28:19 -04:00
Herbert Thielen
2a720ac1bb
Merge branch 'master' into hethi/issue-1175-cmake-build-type
2017-08-31 20:51:49 +02:00
Herbert Thielen
e033d8c73d
change links from former code.google.com to current github repository
2017-08-31 18:12:17 +02:00
Gennadiy Civil
7f27d8bdd1
Merge branch 'master' into hethi/issue-1175-cmake-build-type
2017-08-31 11:13:09 -04:00
Herbert Thielen
84bd72ba3c
Merge branch 'master' into hethi/fix-faq-example-comment
2017-08-31 16:12:27 +02:00
Herbert Thielen
14cf7f574a
fix example's comment
2017-08-31 16:10:36 +02:00
Claus Stovgaard
34355c0e87
Merge remote-tracking branch 'github_google/master' into master-github_frosteyes
...
# Conflicts:
# .gitignore
2017-08-31 12:22:53 +02:00
Herbert Thielen
d6c46ebd04
Merge branch 'master' into hethi/issue-1175-cmake-build-type
2017-08-31 08:47:26 +02:00
Herbert Thielen
cfcc89a84a
Merge branch 'master' into hethi/issue-1175-cmake-build-type
2017-08-30 21:46:30 +02:00
Gennadiy Civil
fa70b84ab5
Removed "Trivial"
...
Who knows? may not be very trivial given the code drift between internal and OSS
2017-08-30 14:51:36 -04:00
Gennadiy Civil
c4e01616af
removed internal link ( not allowed in OSS)
2017-08-30 14:50:40 -04:00
Scott Graham
0eb49f4d6b
Note that it is preferable for Googlers to create a CL internally first
2017-08-30 11:29:06 -07:00
Gennadiy Civil
bb1c4af487
Merge branch 'master' into master
2017-08-30 14:11:38 -04:00
Herbert Thielen
9ba7946bde
create different python based tests for single and multi configuration build generators
2017-08-30 19:17:26 +02:00
Herbert Thielen
47ad2993b6
Revert "ask cmake for per-configuration output subdir"
...
This reverts commit 73d58dd4c83883b46697798e978d576b28b1d24e.
Unfortunately, ${CMAKE_CFG_INTDIR} is set during build only and doesn't
help here.
2017-08-30 15:14:34 +02:00
Herbert Thielen
73d58dd4c8
ask cmake for per-configuration output subdir
...
On single-configuration build systems as Makefile Generators, there is
no subdirectory for the configuration in the build tree - therefore ask
cmake for the subdir by using CMAKE_CFG_INTDIR, which is just '.' on
single-configuration build systems (Linux et al.).
2017-08-30 12:59:06 +02:00
Herbert Thielen
7529c8aa05
remove obsolete comment regarding python tests on linux
2017-08-30 12:48:28 +02:00
Herbert Thielen
f0c72bfe09
fix SetUp/TearDownTestCase() in AdvancedGuide
...
fixes issue #1087
2017-08-30 12:19:59 +02:00
Scott Graham
c3d1d33560
Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIA
2017-08-29 12:45:26 -07:00
Herbert Thielen
daaed2b6cb
fix typo in comment and string (SetUpTestCase)
2017-08-29 14:22:09 +02:00
Arkady Shapkin
45287f3dff
Remove gtest VS2005 projects
2017-08-25 01:57:35 +03:00
Gennadiy Civil
87327b12e9
Merge branch 'master' into master
2017-08-23 14:27:55 -04:00
Arkady Shapkin
88269cd365
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
d93ce9d6fb
Merge branch 'master' of github.com:Dani-Hub/googletest
2017-08-22 21:13:32 +02:00
drgler
6404d45a92
Merge branch 'master' of github.com:Dani-Hub/googletest
2017-08-22 20:18:54 +02:00
Daniel Krügler
8304d06199
Merge branch 'master' into master
2017-08-21 20:14:09 +02:00
Gennadiy Civil
96f7ba83cb
Merge branch 'master' into wrong-version-reported
2017-08-21 13:11:58 -04:00
Henry Schreiner
5518a1d350
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
9cacce4e5c
Add documentation for pkg-config
2017-08-14 13:45:56 +02:00
David Seifert
8604c4adac
Add support for pkgconfig
2017-08-14 13:45:56 +02:00
Gennadiy Civil
673c975a96
Merge pull request #905 from iignatev/master
...
enable null detection on Solaris Studio 12u4+
2017-08-13 21:34:10 -04:00
Gennadiy Civil
e3bd4cbeae
Merge pull request #1160 from mwoehlke-kitware/honor-lib_suffix
...
Fix library install destinations
2017-08-11 09:14:49 -04:00
Gennadiy Civil
c81be0f6fc
Merge pull request #871 from tommyleo2/master
...
Update Primer.md
2017-08-10 21:34:15 -04:00
Gennadiy Civil
c523461f3a
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
c822c85659
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
1579064390
Merge pull request #1127 from zulkarnine/patch-1
...
Fix background color in ColoredPrintf
2017-08-10 20:43:26 -04:00
Gennadiy Civil
cfab28d594
Merge pull request #1192 from eduherminio/master
...
Minor style fixes
2017-08-10 20:36:29 -04:00
Gennadiy Civil
e578186528
Merge pull request #1191 from gennadiycivil/master
...
Adding Bazel build to googletest (initial version )
2017-08-10 20:35:27 -04:00
misterg
97a8498873
Addressing Comments
2017-08-10 16:33:22 -04:00
drgler
07bba78a5f
Merge branch 'master' of github.com:Dani-Hub/googletest
2017-08-10 21:18:22 +02:00
Herbert Thielen
dc7214f222
say "former version" instead of "released version"
2017-08-10 20:21:46 +02:00
Eduardo Caceres
854b28f199
Minor style fixes
...
Typos, punctuation & broken links
2017-08-10 18:05:32 +02:00
