summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'cmake-presets-no-path-arg-warning' into release-3.19Brad King2020-11-034-1/+22
|\
| * CMakePresets.json: Don't warn if no path argument is givenKyle Edwards2020-11-024-1/+22
* | Merge topic 'fix-cuda-qnx' into release-3.19Brad King2020-11-034-3/+9
|\ \
| * | Help: Add 3.19 release note about CUDA support on QNXBrad King2020-11-021-0/+2
| * | CUDA: Enable support on QNXjanbernloehr2020-11-023-3/+7
* | | Merge topic 'doc-cpack-pre-post-scripts' into release-3.19Craig Scott2020-11-031-16/+28
|\ \ \
| * | | Help: Clarify variables specifying scripts to execute during packagingCraig Scott2020-11-031-16/+28
| | |/ | |/|
* | | Merge topic 'FindBoost-config-mode' into release-3.19Brad King2020-11-021-2/+8
|\ \ \ | |/ / |/| |
| * | FindBoost: Avoid leaking internal Boost_ROOT settingBrad King2020-10-301-2/+8
| |/
* | Merge topic 'CheckSourceRuns-compatibility' into release-3.19Brad King2020-10-307-3/+31
|\ \
| * | CheckSourceRuns: do not fail on unrecognized argumentsBen Boeckel2020-10-287-3/+31
* | | Merge topic 'string-json-doc-update' into release-3.19Craig Scott2020-10-301-10/+13
|\ \ \ | |_|/ |/| |
| * | Help: Clarify string(JSON) error handlingPeter Steneteg2020-10-281-10/+13
* | | CMake 3.19.0-rc2v3.19.0-rc2Brad King2020-10-281-1/+1
* | | Merge topic 'cmake-presets-help-flag' into release-3.19Brad King2020-10-283-3/+8
|\ \ \
| * | | ccmake: Don't list --preset in --helpKyle Edwards2020-10-273-3/+8
* | | | Merge topic 'cmake_path-update-doc' into release-3.19Brad King2020-10-281-122/+127
|\ \ \ \
| * | | | cmake_path: Enhance documentationMarc Chevrier2020-10-261-122/+127
* | | | | Merge topic 'cmake-gui-manual-argument' into release-3.19Brad King2020-10-283-14/+26
|\ \ \ \ \
| * | | | | CMake GUI: Add --browse-manual argumentKyle Edwards2020-10-273-14/+26
| | |/ / / | |/| | |
* | | | | Merge topic 'FindRuby-restore-VENDORLIB_DIR' into release-3.19Brad 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 topic 'xcode-fix-source-linking' into release-3.19Brad King2020-10-281-2/+3
|\ \ \ \ \ \
| * | | | | | Xcode: Fix regression that automatically links libraries in source listGusts Kaksis2020-10-271-2/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Merge topic 'ci-config-sync' into release-3.19Brad 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 topic 'cuda_vs_skip_computation' into release-3.19Brad King2020-10-275-2/+21
|\ \ \ \ \
| * | | | | VS: Don't compute CUDA options unless necessaryRaul Tambre2020-10-275-2/+21
| * | | | | Merge branch 'ninja-multi-per-config-sources' into release-3.18Brad King2020-10-263-1/+15
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'cmake-E-cat-binary' into release-3.18Brad King2020-10-1513-54/+109
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
* | | | | | | Merge topic 'cmake-presets-path-arg' into release-3.19Craig Scott2020-10-2715-32/+65
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | CMakePresets.json: Rework how --preset argument is handledKyle Edwards2020-10-2615-32/+65
* | | | | | | Merge topic 'correct_msvc_cuda_flag_warning' into release-3.19Brad King2020-10-271-4/+11
|\ \ \ \ \ \ \
| * | | | | | | CUDA: Use MSVC version to determine supported C++ standard levelsRobert Maynard2020-10-261-4/+11
* | | | | | | | Merge topic 'check-module-name-conflicts' into release-3.19Brad King2020-10-2723-356/+386
|\ \ \ \ \ \ \ \
| * | | | | | | | Modules: Do not implicitly add new functions via old Check ModulesRobert Maynard2020-10-2623-356/+386
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge topic 'ninja-multi-per-config-sources' into release-3.19Brad King2020-10-273-1/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'release' into ninja-multi-per-config-sourcesKyle Edwards2020-10-263663-16910/+57048
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge topic 'correct_profiling-output_exception' into release-3.19Brad King2020-10-261-3/+3
|\ \ \ \ \ \ \
| * | | | | | | cmake: command arguments which use '=' behave consistentlyRobert Maynard2020-10-231-3/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Merge topic 'per-config-source-TARGET_FILE' into release-3.19Brad King2020-10-262-6/+24
|\ \ \ \ \ \ \
| * | | | | | | add_custom_command: Properly recognize if sources depend on configDeniz Bahadir2020-10-222-6/+24
* | | | | | | | Merge topic 'FindBoost-config-mode' into release-3.19Brad King2020-10-261-1/+12
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | FindBoost: Honor BOOST_ROOT when finding upstream BoostConfigBrad King2020-10-221-0/+6
| * | | | | | | FindBoost: Honor Boost_NO_SYSTEM_PATHS when finding upstream BoostConfigBrad King2020-10-221-1/+6
* | | | | | | | Merge topic 'docs-cleanup-3.19' into release-3.19Craig Scott2020-10-2614-90/+107
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Help: Cleanup typos and grammar for the 3.19 releaseCraig Scott2020-10-2414-90/+107
|/ / / / / / /
* | | | | | | Merge topic 'vs-fortran-debugging-flags' into release-3.19Brad King2020-10-231-3/+2
|\ \ \ \ \ \ \