Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'server-file-monitor-check' into release-3.13 | Brad King | 2018-11-01 | 1 | -1/+2 |
|\ | |||||
| * | server: Fix assertion failure on directory paths in file monitor | Vladimir Penev | 2018-11-01 | 1 | -1/+2 |
* | | Merge branch 'FindProtobuf-threads' into release-3.13 | Brad King | 2018-10-31 | 1 | -14/+22 |
|\ \ | |||||
| * | | FindProtobuf: Add missing link dependencies on threads | Brad King | 2018-10-31 | 1 | -14/+22 |
* | | | Merge branch 'fix-custom-target-with-csharp' into release-3.13 | Brad King | 2018-10-31 | 9 | -31/+40 |
|\ \ \ | |||||
| * | | | CSharp: Fix regression in VS project type selection for custom target | Brad King | 2018-10-31 | 9 | -31/+40 |
* | | | | Merge branch 'FindPostgreSQL-11' into release-3.13 | Brad King | 2018-10-31 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | FindPostgreSQL: Search for version 11 | Sylvain Joubert | 2018-10-30 | 1 | -2/+2 |
* | | | | | Merge branch 'UseSWIG-typos' into release-3.13 | Brad King | 2018-10-29 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | UseSWIG: Add target language and input file in command description | Sylvain Joubert | 2018-10-29 | 1 | -1/+1 |
| * | | | | | UseSWIG: Typo, add missing letter | Sylvain Joubert | 2018-10-29 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'FindBoost-stacktrace' into release-3.13 | Brad King | 2018-10-29 | 1 | -0/+6 |
|\ \ \ \ \ | |||||
| * | | | | | FindBoost: Add support for stacktrace components | Martin Quinson | 2018-10-29 | 1 | -0/+6 |
* | | | | | | Merge branch 'flang-preprocess-source' into release-3.13 | Brad King | 2018-10-29 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Flang: Fix command-line used to preprocess sources | Brad King | 2018-10-29 | 1 | -1/+1 |
* | | | | | | | Merge branch 'qccDepfile' into release-3.13 | Brad King | 2018-10-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | QNX: Update qcc depfile flags to be compliant with ccache | Maikel van den Hurk | 2018-10-29 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'cuda-filter-device-link-libs' into release-3.13 | Brad King | 2018-10-29 | 1 | -8/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | CUDA: Filter out non-static libraries during device linking | Robert Maynard | 2018-10-29 | 1 | -8/+8 |
* | | | | | | | | Merge branch 'UseSWIG-multi-input' into release-3.13 | Brad King | 2018-10-29 | 2 | -2/+40 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | UseSWIG: multiple input files must be supported in version 2 | Marc Chevrier | 2018-10-29 | 2 | -2/+40 |
* | | | | | | | | | Merge branch 'set_directory_properties-script-mode' into release-3.13 | Brad King | 2018-10-29 | 7 | -2/+19 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | set_directory_properties: Restore in script mode | Brad King | 2018-10-29 | 7 | -2/+19 |
* | | | | | | | | | Merge branch 'doc-updates' into release-3.13 | Brad King | 2018-10-26 | 4 | -7/+19 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Help: clarify "LINKER:" prefix usage | Marc Chevrier | 2018-10-26 | 4 | -7/+19 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'FindMPI-pthread-cuda' into release-3.13 | Brad King | 2018-10-25 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | FindMPI: Pass -pthread to CUDA compiler through -Xcompiler | Brad King | 2018-10-25 | 1 | -1/+6 |
* | | | | | | | | CMake 3.13.0-rc2v3.13.0-rc2 | Brad King | 2018-10-25 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'FindBoost-1.69' into release-3.13 | Brad King | 2018-10-25 | 1 | -14/+29 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | FindBoost: Add support for upcoming Boost 1.69 | Mateusz Ĺoskot | 2018-10-25 | 1 | -14/+29 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'cmake-gui-vs-open-space' into release-3.13 | Brad King | 2018-10-25 | 1 | -2/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | cmake-gui: Fix "Open Project" for VS IDE with space in path | Brad King | 2018-10-25 | 1 | -2/+3 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'fix-no-testing' into release-3.13 | Brad King | 2018-10-24 | 2 | -4/+5 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Tests: Add missing BUILD_TESTING conditions | Brad King | 2018-10-24 | 2 | -4/+5 |
* | | | | | | | Merge branch 'cuda-thread-flags' into release-3.13 | Brad King | 2018-10-24 | 9 | -18/+94 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | CUDA: Add test for device linking when host linking uses threads | Robert Maynard | 2018-10-24 | 7 | -16/+73 |
| * | | | | | | | FindThreads: Pass -pthread to CUDA compiler through -Xcompiler | Rolf Eike Beer | 2018-10-24 | 1 | -1/+3 |
| * | | | | | | | Merge branch 'cuda-filter-device-link-items' into cuda-thread-flags | Brad King | 2018-10-24 | 1 | -1/+18 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | CUDA: Filter out host link flags during device linking | Robert Maynard | 2018-10-24 | 1 | -1/+18 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
* | | | | | | | | Merge branch 'tar-warnings' into release-3.13 | Brad King | 2018-10-24 | 1 | -13/+31 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | cmake: Distinguish '-E tar' warnings from errors copying data | Brad King | 2018-10-24 | 1 | -13/+31 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'vs-csharp-win32-flags' into release-3.13 | Brad King | 2018-10-23 | 5 | -10/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | VS: Fix CSharp support for win32res: and win32icon: flags | Brad King | 2018-10-23 | 5 | -10/+10 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'vs-csharp-in-custom-target' into release-3.13 | Brad King | 2018-10-23 | 4 | -0/+7 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | VS: Fix crash on CSharp sources in a custom target | Brad King | 2018-10-23 | 4 | -0/+7 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'GNUInstallDirs-kfreebsd-man' into release-3.13 | Brad King | 2018-10-22 | 2 | -2/+2 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | GNUInstallDirs: Don't use BSD info and man paths on GNU/kFreeBSD | James Clarke | 2018-10-22 | 2 | -2/+2 |
| |/ / / / | |||||
* | | | | | Merge branch 'update-curl' into release-3.13 | Brad King | 2018-10-22 | 114 | -1859/+2568 |
|\ \ \ \ \ | |||||
| * | | | | | curl: Update build within CMake to account for 7.61 changes | Brad King | 2018-10-22 | 2 | -2/+1 |
| * | | | | | curl: Backport to work with CMake 3.1 again | Brad King | 2018-10-22 | 1 | -2/+3 |