summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gtest-discovery-timeout' into release-3.10Brad King2017-12-079-4/+74
|\
| * GoogleTest: Add test for missing test executableMatthew Woehlke2017-12-063-0/+10
| * GoogleTest: Add timeout to discoveryMatthew Woehlke2017-12-067-1/+57
| * GoogleTest: Improve gtest_discover_tests messagesMatthew Woehlke2017-11-301-3/+7
* | Merge branch 'backport-revert-server-target-backtraces' into release-3.10Brad King2017-12-064-95/+13
|\ \
| * | server: Revert "Report backtraces in codemodel response"Brad King2017-12-064-95/+13
* | | Merge branch 'findmpi-notfound-spam' into release-3.10Brad King2017-12-051-10/+16
|\ \ \
| * | | FindMPI: Correct legacy variable handlingChristian Pfeiffer2017-12-051-10/+16
| |/ /
* | | Merge branch 'findmpi-found-cond' into release-3.10Brad King2017-12-051-1/+1
|\ \ \
| * | | FindMPI: Fix multiple configure runsChristian Pfeiffer2017-12-051-1/+1
| |/ /
* | | Merge branch 'cpack-pkg-fix' into release-3.10releaseBrad King2017-12-011-1/+1
|\ \ \
| * | | CPack: Fix macOS PKG component dependency informationAlexander Wittig2017-12-011-1/+1
| |/ /
* | | Merge branch 'bootstrap-clang-5' into release-3.10Brad King2017-11-301-0/+1
|\ \ \
| * | | bootstrap: Check support for unordered_map from compiler modeAdam Ciarciński2017-11-301-0/+1
| |/ /
* | | Merge branch 'clang-cl-fix' into release-3.10Brad King2017-11-281-3/+3
|\ \ \
| * | | Clang: Do not mistake clang-cl 6.0 for GNU-like clangİsmail Dönmez2017-11-281-3/+3
| |/ /
* | | Merge branch 'cuda-implicit-include-dirs' into release-3.10Brad King2017-11-271-0/+3
|\ \ \ | |_|/ |/| |
| * | CUDA: Treat /usr/include as an implicit include directoryBrad King2017-11-271-0/+3
| |/
* | Merge branch 'gtest-fix-discovery' into release-3.10Brad King2017-11-215-5/+67
|\ \ | |/ |/|
| * GoogleTest: Fix multiple discovery on same targetMatthew Woehlke2017-11-215-5/+67
|/
* CMake 3.10.0v3.10.0Brad King2017-11-201-1/+1
* Merge branch 'fix-cmake-server-bad-buffering' into release-3.10Brad King2017-11-201-3/+2
|\
| * server: Fix regression in partial message handlingvector-of-bool2017-11-201-3/+2
* | Merge branch 'FindOpenGL-glvnd-preference' into release-3.10Brad King2017-11-151-13/+57
|\ \
| * | FindOpenGL: Add option to prefer GLVND for legacy GLBrad King2017-11-151-13/+56
| * | FindOpenGL: Re-order component library searchesBrad King2017-11-151-7/+8
| |/
* | Merge branch 'cmake-gui-qt-static-windows' into release-3.10Brad King2017-11-143-5/+23
|\ \ | |/ |/|
| * Tests: Add options to disable tests requiring QtBrad King2017-11-131-4/+12
| * cmake-gui: Add build option to use Qt5 windows plugin staticallyBrad King2017-11-132-1/+11
|/
* CMake 3.10.0-rc5v3.10.0-rc5Brad King2017-11-101-1/+1
* Merge branch 'windows-mt-update-quiet' into release-3.10Brad King2017-11-101-14/+23
|\
| * Windows: Do not report manifest tool update notification as failureBrad King2017-11-101-14/+23
* | Merge branch 'doxygen_dot' into release-3.10Brad King2017-11-101-1/+5
|\ \
| * | FindDoxygen: Fix setting of HAVE_DOT in non-backward-compat modeAndré Apitzsch2017-11-101-1/+5
| |/
* | Merge branch 'FindOpenGL-no-glvnd-for-GL' into release-3.10Brad King2017-11-091-20/+24
|\ \
| * | FindOpenGL: Default to non-GLVND libraries for legacy GLBrad King2017-11-091-20/+24
* | | Merge branch 'FindHDF5-c-version' into release-3.10Brad King2017-11-081-1/+1
|\ \ \
| * | | FindHDF5: Fix H5_VERSION on Patch in CAxel Huebl2017-11-081-1/+1
* | | | Merge branch 'implicit-lib-gcceh' into release-3.10Brad King2017-11-082-2/+22
|\ \ \ \
| * | | | Restore exclusion of "gcc_eh" from implicit link librariesChristian Pfeiffer2017-11-082-2/+22
* | | | | Merge branch 'FindOpenGL-clarify-libraries' into release-3.10Brad King2017-11-071-1/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | FindOpenGL: Clarify logic constructing OPENGL_LIBRARIESBrad King2017-11-071-1/+2
| | |/ / | |/| |
* | | | Merge branch 'csharp-version-english' into release-3.10Brad King2017-11-071-1/+1
|\ \ \ \
| * | | | CSharp: Fix compiler version detection in non-English languagesYoshinori Tahara2017-11-071-1/+1
| |/ / /
* | | | Merge branch 'irsl-win2018' into release-3.10Brad King2017-11-061-3/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | IRSL: Add support for the 2018 release on Windows.Christian Pfeiffer2017-11-061-3/+5
| |/ /
* | | CMake 3.10.0-rc4v3.10.0-rc4Brad King2017-11-011-1/+1
* | | Merge branch 'mingw-clang-c-compile-features' into release-3.10Brad King2017-11-011-1/+1
|\ \ \
| * | | Record C compile features flags for MinGW Clang on WindowsBrad King2017-11-011-1/+1
| |/ /
* | | Merge branch 'autogen-moc-predefs-no-moc-options' into release-3.10Brad King2017-10-312-3/+12
|\ \ \