aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Merge branch 'master' into hethi/unused-importGennadiy Civil2017-09-112-28/+21
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into hethi/unused-importHerbert Thielen2017-09-086-11/+42
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into hethi/unused-importHerbert Thielen2017-09-0522-75/+103
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'master' into hethi/unused-importHerbert Thielen2017-08-314-3/+10
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into hethi/unused-importGennadiy Civil2017-08-301-2/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into hethi/unused-importHerbert Thielen2017-08-3011-16/+141
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | remove unused TestCase importHerbert Thielen2017-08-291-1/+0
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1250 from ↵Gennadiy Civil2017-09-111-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aninf-wo/hethi/remove-linker-warning-on-non-existing-path remove obsolete link_directories command
| * | | | | | | | | | | Merge branch 'master' into hethi/remove-linker-warning-on-non-existing-pathHerbert Thielen2017-09-086-11/+42
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | remove obsolete link_directories commandHerbert Thielen2017-09-051-3/+0
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's not necessary, as the target_link_libraries command contains an absolute path already, and the path given doesn't exist anymore, leading only to linker warnings like: ld: warning: directory not found for option '-L/Users/travis/build/google/googletest/build/googlemock/gtest/src'
* | | | | | | | | | | Merge pull request #1203 from eidosmontreal/user_logger_instead_of_printfGennadiy Civil2017-09-111-26/+19
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | User logger GTEST_LOG instead of printf in gtest.cc to log errors
| * | | | | | | | | | Merge commit 'a33b6b091999d44f771761be03beb64d3af2350a' into ↵Gasprd Petit2017-09-079-26/+70
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user_logger_instead_of_printf
| * | | | | | | | | | | Removed flush scopes around GTEST_LOG(FATAL) and exit call since FATAL is ↵Gasprd Petit2017-09-071-16/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expected to abort()
| * | | | | | | | | | | Merge branch 'master' into user_logger_instead_of_printfGennadiy Civil2017-09-0181-1348/+2699
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Removed extra colon in error loggpetit2017-08-141-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into user_logger_instead_of_printfgpetit2017-08-14111-27398/+1254
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Use GTEST_LOG instead of printfgpetit2017-08-141-23/+26
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1254 from aninf-wo/hethi/cleanup-travis-environmentGennadiy Civil2017-09-081-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | remove unused variables from travis environment
| * | | | | | | | | | | | | Merge branch 'master' into hethi/cleanup-travis-environmentHerbert Thielen2017-09-085-8/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | remove unused variables from travis environmentHerbert Thielen2017-09-051-2/+2
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
| | | | | | | | | | | * | Swap reinterpret_cast for static_caststkhapugin@chromium.org2017-09-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Swap reinterpret_cast for static_cast
| | | | | | | | | | | * | Merge branch 'master' into masterStepan Khapugin2017-09-084-7/+5
| | | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1251 from ↵Gennadiy Civil2017-09-071-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aninf-wo/hethi/drop-valgrind-installation-on-travis drop unused valgrind package from Travis build slave installation
| * | | | | | | | | | | | | drop unused valgrind package from installationHerbert Thielen2017-09-051-2/+0
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and remove explicit gcc installation (will be installed with g++ automatically)
* | | | | | | | | | | | | Merge pull request #1243 from aninf-wo/hethi/travis-release-buildGennadiy Civil2017-09-074-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | switch one Trevis build to Release mode
| * | | | | | | | | | | | use GTEST_ATTRIBUTE_UNUSED_ instead of dummy functionHerbert Thielen2017-09-071-7/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into hethi/travis-release-buildHerbert Thielen2017-09-074-4/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | avoid warning about unused variableHerbert Thielen2017-09-041-1/+7
| | | | | | | | | | | | |
| * | | | | | | | | | | | avoid -Wshadow warning on GCCHerbert Thielen2017-09-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using INSTANTIATE_TEST_CASE_P with a lambda function which uses 'info' as parameter name, GCC complains that this would shadow parameter 'info' used in the macro's VA_ARGS call.
| * | | | | | | | | | | | treat all warnings as errors for GCC (-Werror)Herbert Thielen2017-09-011-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | switch one build to Release modeHerbert Thielen2017-09-011-1/+1
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This turns on optimization which allows the compiler to discover more problems and omit some more warnings.
| | | | | | | | | | * | Merge branch 'master' into masterStepan Khapugin2017-09-074-4/+37
| | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1246 from aninf-wo/hethi/enable-travis-gcc-cacheGennadiy Civil2017-09-061-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | enable Travis ccache to speed up CI builds
| * | | | | | | | | | | | reset ccache statistics at installHerbert Thielen2017-09-051-0/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | show ccache statistics in logHerbert Thielen2017-09-051-0/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | call clang via ccache on LinuxHerbert Thielen2017-09-051-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | install ccache on travis osx build slaveHerbert Thielen2017-09-041-0/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | cache ccacheHerbert Thielen2017-09-041-0/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1247 from aninf-wo/hethi/enable-parallel-buildsGennadiy Civil2017-09-061-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | run parallelized builds on Travis CI
| * | | | | | | | | | | limit processors to use in Travis build to 4Herbert Thielen2017-09-041-2/+11
| | | | | | | | | | | |
| * | | | | | | | | | | set MAKEFLAGS to use multiple processors on Travis CIHerbert Thielen2017-09-041-0/+11
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #975 from LebedevRI/respect-optionGennadiy Civil2017-09-052-3/+8
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | CMake: use threads if allowed and found, not just if found.
| * | | | | | | | | | CMake: use threads if allowed and found, not just if found.Roman Lebedev2017-09-012-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | | | | | | | * | add a castStepan Khapugin2017-09-051-1/+2
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #900 from Gallaecio/patch-1Gennadiy Civil2017-09-011-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix WhenSorted() documentation example
| * | | | | | | | | | Fix WhenSorted() documentation exampleGallaecio2016-10-081-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #783 from tobbi/cppcheck_perf_fixesGennadiy Civil2017-09-012-5/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | Performance fixes reported by cppcheck
| * | | | | | | | | | Performance fixes reported by cppcheckTobias Markus2016-05-222-6/+5
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #1011 from zeitounator/wrong-version-reportedGennadiy Civil2017-09-012-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Wrong version reported (1.7.0 should be 1.8.0)
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into wrong-version-reportedGennadiy Civil2017-08-21118-27409/+1518
| |\ \ \ \ \ \ \ \ \ \ \