summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | VS: Remove flag table entries for Fortran /Z* flagsVolker Jacht2020-10-221-3/+2
| |/ / / / / /
* | | | | | | Merge topic 'cmake-presets-toolset-arch-config' into release-3.19Craig Scott2020-10-2333-95/+241
|\ \ \ \ \ \ \
| * | | | | | | CMakePresets.json: Split cmakeGeneratorConfig fieldKyle Edwards2020-10-2233-95/+241
| | |/ / / / / | |/| | | | |
* | | | | | | Merge topic 'cmake-presets-source-dir-name' into release-3.19Craig Scott2020-10-235-0/+12
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | CMakePresets.json: Add ${sourceDirName} macroKyle Edwards2020-10-225-0/+12
|/ / / / / /
* | | | | | Merge topic 'cmake-presets-invalid-macro' into release-3.19Kyle Edwards2020-10-2217-183/+268
|\ \ \ \ \ \
| * | | | | | CMakePresets.json: Properly report macro expansion errorsKyle Edwards2020-10-2117-183/+268
| |/ / / / /
* | | | | | Merge topic 'cmake-presets-boolean-cache' into release-3.19Kyle Edwards2020-10-226-7/+71
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | CMakePresets.json: Allow boolean for cache variable valueKyle Edwards2020-10-216-7/+71
|/ / / / /
* | | | | Merge topic 'cmakepresets-schema' into release-3.19Kyle Edwards2020-10-2110-2/+315
|\ \ \ \ \
| * | | | | CI: Install jsonschema for schema testingKyle Edwards2020-10-203-1/+3
| * | | | | Tests: Add JSON schema validation to CMakePresets.json testsKyle Edwards2020-10-204-1/+61
| * | | | | Help: Add JSON schema for CMakePresets.jsonBen McMorran2020-10-203-0/+251
* | | | | | Merge topic 'ci-win-python' into release-3.19Brad King2020-10-202-0/+44
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | ci: add Python to PATH on WindowsBrad King2020-10-202-0/+44
|/ / / / /
* | | | | Merge topic 'cmake-presets-doc-move' into release-3.19Kyle Edwards2020-10-206-332/+388
|\ \ \ \ \
| * | | | | Help: Clarify purpose of warnings and errorsKyle Edwards2020-10-191-4/+4
| * | | | | Help: Make architecture and toolset descriptions genericKyle Edwards2020-10-191-4/+4
| * | | | | Help: Add inheritance to CMakePresets.json exampleKyle Edwards2020-10-191-0/+7
| * | | | | Help: Add documentation for debug fieldKyle Edwards2020-10-191-0/+20
| * | | | | Help: Show environment fieldKyle Edwards2020-10-192-0/+5
| * | | | | Help: Show multiple ways of doing cacheVariablesKyle Edwards2020-10-192-3/+5
| * | | | | Help: Move vendor field into exampleKyle Edwards2020-10-192-14/+12
| * | | | | Help: s/unusedVars/unusedCli/Kyle Edwards2020-10-191-1/+1
| * | | | | Help: Move CMakePresets.json documentation into a separate fileKyle Edwards2020-10-194-329/+353
* | | | | | Merge topic 'find_package-check-dir' into release-3.19Brad King2020-10-201-1/+1
|\ \ \ \ \ \
| * | | | | | find_package: Fix regression in searching root prefixBrad King2020-10-191-1/+1
|/ / / / / /
* | | | | | Merge topic 'FindPython-support-version-3.10' into release-3.19Brad King2020-10-191-1/+1
|\ \ \ \ \ \
| * | | | | | FindPython: Add support of version 3.10Marc Chevrier2020-10-161-1/+1
* | | | | | | Merge topic 'separate_arguments-no-args' into release-3.19Brad King2020-10-194-0/+20
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | separate_arguments: Fix crash on *_COMMAND with no argumentsRobert Bozzetto2020-10-164-0/+20
| |/ / / / /