aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into hethi/cleanup-travis-environmentHerbert Thielen2017-09-085-8/+34
|\
| * 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
| | |\ \ | | |/ / | |/| |
| * | | 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
| | |/ /
| | | * 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.
* | / remove unused variables from travis environmentHerbert Thielen2017-09-051-2/+2
|/ /
* | 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.
* | 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
| |\ \ \
| * | | | googlemock version must be changed as wellOlivier Clavel2017-02-131-2/+2
| | | | | | | | | | | | | | | keep googletest and googlemock versions in sync
| * | | | Wrong version reported (1.7.0 should be 1.8.0)Olivier Clavel2017-02-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | `gtest-config --version` reports wrong version. Made against master branch but please note that this affects tag release-1.8.0 and the distribution tarballs.
* | | | | Merge pull request #1235 from aninf-wo/hethi/issue-1175-cmake-build-typeGennadiy Civil2017-09-013-13/+24
|\ \ \ \ \ | | | | | | | | | | | | use cmake build type defined in .travis.yml for travis builds
| * \ \ \ \ Merge branch 'master' into hethi/issue-1175-cmake-build-typeHerbert Thielen2017-08-311-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into hethi/issue-1175-cmake-build-typeGennadiy Civil2017-08-312-2/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into hethi/issue-1175-cmake-build-typeHerbert Thielen2017-08-314-3/+10
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into hethi/issue-1175-cmake-build-typeHerbert Thielen2017-08-301-2/+2
| |\ \ \ \ \ \ \ \
| * | | | | | | | | create different python based tests for single and multi configuration build ↵Herbert Thielen2017-08-301-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generators
| * | | | | | | | | Revert "ask cmake for per-configuration output subdir"Herbert Thielen2017-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 73d58dd4c83883b46697798e978d576b28b1d24e. Unfortunately, ${CMAKE_CFG_INTDIR} is set during build only and doesn't help here.
| * | | | | | | | | ask cmake for per-configuration output subdirHerbert Thielen2017-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.).
| * | | | | | | | | remove obsolete comment regarding python tests on linuxHerbert Thielen2017-08-301-2/+0
| | | | | | | | | |
| * | | | | | | | | use upper-case build typeHerbert Thielen2017-08-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While cmake does not complain on build type 'debug', the cmake documentation always spells it 'Debug', so take this.
| * | | | | | | | | use build type set in .travis.ymlHerbert Thielen2017-08-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The BUILD_TYPE variable of .travis.yml was ignored up to now.
* | | | | | | | | | Merge pull request #870 from KindDragon/mingw64-appveyourGennadiy Civil2017-09-011-36/+53
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | AppVeyor MinGW-w64 test build
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into mingw64-appveyourArkady Shapkin2017-09-0110-13/+13
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #1241 from aninf-wo/hethi/issue-635-old-linksGennadiy Civil2017-08-3110-13/+13
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | change links from former code.google.com to current github repository
| * | | | | | | | | | change links from former code.google.com to current github repositoryHerbert Thielen2017-08-3110-13/+13
| | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | Merge branch 'master' into mingw64-appveyourArkady Shapkin2017-08-314-5/+4
| | |\ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #1240 from aninf-wo/hethi/fix-faq-example-commentGennadiy Civil2017-08-311-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | fix example's comment
| * | | | | | | | | Merge branch 'master' into hethi/fix-faq-example-commentHerbert Thielen2017-08-312-2/+2
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #865 from frosteyes/masterGennadiy Civil2017-08-312-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | Moved the ignoring of *.pyc files to top level
| * | | | | | | | | Merge remote-tracking branch 'github_google/master' into master-github_frosteyesClaus Stovgaard2017-08-31159-28687/+3877
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # .gitignore
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-12 08:14:30 +0000