summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | CMake Nightly Date StampKitware Robot2020-10-291-1/+1
* | | | | | Merge topic 'update-vim-syntax'Brad King2020-10-282-16/+758
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'upstream-vim-cmake-syntax' into update-vim-syntaxBrad King2020-10-282-16/+758
| |\ \ \ \ \ \ |/ / / / / / /
| * | | | | | vim-cmake-syntax 2020-10-28 (bcc3a97a)vim-cmake-syntax upstream2020-10-282-11/+778
* | | | | | | Merge branch 'release-3.19' into masterBrad King2020-10-280-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | CMake 3.19.0-rc2v3.19.0-rc2Brad King2020-10-281-1/+1
* | | | | | | Merge branch 'release-3.19'Brad King2020-10-280-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge topic 'cmake-presets-help-flag' into release-3.19Brad King2020-10-283-3/+8
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'cmake-presets-help-flag'Brad King2020-10-283-3/+8
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | ccmake: Don't list --preset in --helpKyle Edwards2020-10-273-3/+8
* | | | | | | | Merge branch 'release-3.19'Brad King2020-10-280-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'cmake_path-update-doc' into release-3.19Brad King2020-10-281-122/+127
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'cmake_path-update-doc'Brad King2020-10-281-122/+127
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | cmake_path: Enhance documentationMarc Chevrier2020-10-261-122/+127
* | | | | | | | | Merge topic 'xcode_build_jobs'Brad King2020-10-282-8/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | XCode: Use -j build option when job capacity is specified by userFred Baksik2020-10-262-8/+7
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'release-3.19'Brad King2020-10-280-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'cmake-gui-manual-argument' into release-3.19Brad King2020-10-283-14/+26
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'cmake-gui-manual-argument'Brad King2020-10-283-14/+26
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | CMake GUI: Add --browse-manual argumentKyle Edwards2020-10-273-14/+26
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'aix_makefile_build_jobs'Brad King2020-10-281-3/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Makefiles: Use -j option as "-jN" and not "-j N"Fred Baksik2020-10-261-3/+4
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'release-3.18' into masterBrad King2020-10-280-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'FindRuby-restore-VENDORLIB_DIR' into release-3.18Brad King2020-10-271-0/+1
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'release-3.19'Brad King2020-10-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge topic 'FindRuby-restore-VENDORLIB_DIR' into release-3.19Brad King2020-10-281-0/+1
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge topic 'FindRuby-restore-VENDORLIB_DIR'Brad King2020-10-281-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'release-3.19' into FindRuby-restore-VENDORLIB_DIRBrad King2020-10-273670-16914/+57155
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | / / / / / / | | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | FindRuby: Restore compatibility variable RUBY_VENDORLIB_DIRBrad King2020-10-271-0/+1
* | | | | | | | | | | Merge branch 'release-3.19'Brad King2020-10-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge topic 'xcode-fix-source-linking' into release-3.19Brad King2020-10-281-2/+3
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge topic 'xcode-fix-source-linking'Brad King2020-10-281-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Xcode: Fix regression that automatically links libraries in source listGusts Kaksis2020-10-271-2/+3
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2020-10-281-1/+1
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Merge branch 'release-3.19'Brad King2020-10-270-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'ci-config-sync' into release-3.19Brad King2020-10-274-21/+14
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge topic 'ci-config-sync'Brad King2020-10-274-21/+14
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | ci: update to Qt 5.15.1Ben Boeckel2020-10-272-16/+9
| * | | | | | | | | ci: update to use CMake 3.18.4Ben Boeckel2020-10-272-5/+5
| |/ / / / / / / /
* | | | | | | | | Merge branch 'release-3.18' into masterBrad King2020-10-270-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'cuda_vs_skip_computation' into release-3.18Brad King2020-10-275-2/+21
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'release-3.19'Brad King2020-10-270-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'cuda_vs_skip_computation' into release-3.19Brad King2020-10-275-2/+21
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
* | | | | | | | | | Merge topic 'cuda_vs_skip_computation'Brad King2020-10-275-2/+21
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | VS: Don't compute CUDA options unless necessaryRaul Tambre2020-10-275-2/+21
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'release-3.19'Craig Scott2020-10-270-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'cmake-presets-path-arg' into release-3.19Craig Scott2020-10-2715-32/+65
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'cmake-presets-path-arg'Craig Scott2020-10-2715-32/+65
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | CMakePresets.json: Rework how --preset argument is handledKyle Edwards2020-10-2615-32/+65
* | | | | | | | | Merge topic 'cmake-20866'Brad King2020-10-2730-28/+266
|\ \ \ \ \ \ \ \ \