Herbert Thielen
be94bf501e
remove unused variables from travis environment
7 years ago
Gennadiy Civil
857ddeadeb
Merge pull request #975 from LebedevRI/respect-option
...
CMake: use threads if allowed and found, not just if found.
7 years ago
Gennadiy Civil
7c6353d29a
Merge pull request #900 from Gallaecio/patch-1
...
Fix WhenSorted() documentation example
7 years ago
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.
7 years ago
Gennadiy Civil
52b6ca3428
Merge pull request #783 from tobbi/cppcheck_perf_fixes
...
Performance fixes reported by cppcheck
7 years ago
Gennadiy Civil
e4f6c0b358
Merge pull request #1011 from zeitounator/wrong-version-reported
...
Wrong version reported (1.7.0 should be 1.8.0)
7 years ago
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
7 years ago
Gennadiy Civil
69e794ca75
Merge pull request #870 from KindDragon/mingw64-appveyour
...
AppVeyor MinGW-w64 test build
7 years ago
Arkady Shapkin
633488a763
Merge branch 'master' into mingw64-appveyour
7 years ago
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
7 years ago
Arkady Shapkin
8282229d4f
Merge branch 'master' into mingw64-appveyour
7 years ago
Herbert Thielen
2a720ac1bb
Merge branch 'master' into hethi/issue-1175-cmake-build-type
7 years ago
Herbert Thielen
e033d8c73d
change links from former code.google.com to current github repository
7 years ago
Gennadiy Civil
92e920730d
Merge pull request #1240 from aninf-wo/hethi/fix-faq-example-comment
...
fix example's comment
7 years ago
Gennadiy Civil
7f27d8bdd1
Merge branch 'master' into hethi/issue-1175-cmake-build-type
7 years ago
Herbert Thielen
84bd72ba3c
Merge branch 'master' into hethi/fix-faq-example-comment
7 years ago
Herbert Thielen
14cf7f574a
fix example's comment
7 years ago
Gennadiy Civil
a430e9c176
Merge pull request #865 from frosteyes/master
...
Moved the ignoring of *.pyc files to top level
7 years ago
Claus Stovgaard
34355c0e87
Merge remote-tracking branch 'github_google/master' into master-github_frosteyes
...
# Conflicts:
# .gitignore
7 years ago
Herbert Thielen
d6c46ebd04
Merge branch 'master' into hethi/issue-1175-cmake-build-type
7 years ago
Gennadiy Civil
16bfba08e2
Merge pull request #1230 from aninf-wo/hethi/travis-unused-cmake
...
remove non-existing gmock_build_samples switch
7 years ago
Arkadiy Shapkin
5dde668e09
AppVeyor MinGW-w64 test build
7 years ago
Gennadiy Civil
7f8fefabed
Merge pull request #1237 from sgraham/update-docs-3
...
Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIA, plus small documentation change
7 years ago
Herbert Thielen
cfcc89a84a
Merge branch 'master' into hethi/issue-1175-cmake-build-type
7 years ago
Gennadiy Civil
fa70b84ab5
Removed "Trivial"
...
Who knows? may not be very trivial given the code drift between internal and OSS
7 years ago
Gennadiy Civil
c4e01616af
removed internal link ( not allowed in OSS)
7 years ago
Scott Graham
0eb49f4d6b
Note that it is preferable for Googlers to create a CL internally first
7 years ago
Gennadiy Civil
bb1c4af487
Merge branch 'master' into master
7 years ago
Herbert Thielen
9ba7946bde
create different python based tests for single and multi configuration build generators
7 years ago
Gennadiy Civil
c4ec2ac04d
Merge branch 'master' into hethi/travis-unused-cmake
7 years ago
Herbert Thielen
47ad2993b6
Revert "ask cmake for per-configuration output subdir"
...
This reverts commit 73d58dd4c8
.
Unfortunately, ${CMAKE_CFG_INTDIR} is set during build only and doesn't
help here.
7 years ago
Gennadiy Civil
5d431c650f
Merge pull request #1236 from aninf-wo/hethi/issue-1087-fix-advancedguide
...
fix SetUp/TearDownTestCase() in AdvancedGuide
7 years ago
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.).
7 years ago
Herbert Thielen
7529c8aa05
remove obsolete comment regarding python tests on linux
7 years ago
Herbert Thielen
f0c72bfe09
fix SetUp/TearDownTestCase() in AdvancedGuide
...
fixes issue #1087
7 years ago
Herbert Thielen
dae044d4b9
use upper-case build type
...
While cmake does not complain on build type 'debug', the cmake
documentation always spells it 'Debug', so take this.
7 years ago
Herbert Thielen
cc246ecb56
use build type set in .travis.yml
...
The BUILD_TYPE variable of .travis.yml was ignored up to now.
7 years ago
Herbert Thielen
c780e0e2c4
Merge branch 'master' into hethi/travis-unused-cmake
7 years ago
Gennadiy Civil
71e2858f32
Merge pull request #1226 from aninf-wo/hethi/fix-typo
...
fix typo in comment and string (SetUpTestCase)
7 years ago
Gennadiy Civil
5bd8e83217
Merge branch 'master' into hethi/fix-typo
7 years ago
Gennadiy Civil
298cd5e9c4
Merge pull request #1233 from aninf-wo/hethi/typo-issue-1105
...
fix typos mentioned in issue 1105
7 years ago
Gennadiy Civil
b46755be30
Merge pull request #1229 from aninf-wo/hethi/typo-xUnit
...
fix typo: xUnit
7 years ago
Gennadiy Civil
58fd184c7f
Merge branch 'master' into hethi/typo-xUnit
7 years ago
Gennadiy Civil
c4126e0463
Merge pull request #1232 from aninf-wo/hethi/travis-reduce-buildjobs
...
reduce travis buildjobs by 4/12
7 years ago
Gennadiy Civil
24ceb4f4f5
Merge pull request #1231 from aninf-wo/heth/travis-verbose-make
...
switch on verbose make in travis builds
7 years ago
Scott Graham
c3d1d33560
Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIA
7 years ago
Herbert Thielen
bb8399e1ba
use plural verb as mentioned in issue #1105
7 years ago
Herbert Thielen
29c07aa9db
remove Yob's comma mentioned in issue #1105
7 years ago
Herbert Thielen
d33861dca6
run combined build only
...
There is no need for separate 'googlemock' and 'googletest' builds,
as the 'googlemock' build includes 'googletest' and it's unit tests.
7 years ago
Herbert Thielen
4a45157589
switch on verbose make
7 years ago