summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'commands-file-permissions' into release-3.20Brad King2021-03-299-44/+61
|\
| * Help: Clarify permission-related command optionsCraig Scott2021-03-262-23/+40
| * Cleanup: Fix misspelt name of local C++ variableCraig Scott2021-03-262-14/+14
| * Tests: Check host platform instead of target for running statCraig Scott2021-03-263-7/+7
| * Tests: Remove redundant files for configure_file() testsCraig Scott2021-03-262-0/+0
* | Merge topic 'FindIntl-builtin' into release-3.20Brad King2021-03-292-41/+90
|\ \
| * | FindIntl: Fix detection of intl built in to C libraryBrad King2021-03-262-39/+67
| * | FindIntl: Improve documentation formattingSibi Siddharthan2021-03-261-17/+38
* | | Merge topic 'correct_arg_parsing' into release-3.20Brad King2021-03-294-5/+15
|\ \ \ | |/ / |/| |
| * | cmCommandLineArgument: correctly compute next parse indexRobert Maynard2021-03-264-5/+15
* | | Merge topic 'ninja-multi-long-custom-command' into release-3.20Brad King2021-03-263-0/+27
|\ \ \
| * | | Ninja Multi-Config: Include configs in long CC scriptsKyle Edwards2021-03-253-0/+27
|/ / /
* | | Merge topic 'doc-custom-output-genex' into release-3.20Brad King2021-03-253-3/+11
|\ \ \
| * | | Help: Custom OUTPUT and BYPRODUCTS genexes cannot refer to targetsCraig Scott2021-03-253-3/+11
| | |/ | |/|
* | | Merge topic 'nsis-branding-trim-position' into release-3.20Brad King2021-03-252-3/+12
|\ \ \ | |_|/ |/| |
| * | CPack: Validate and document NSIS branding text trim positionsCraig Scott2021-03-242-3/+12
| |/
* | Merge branch 'release-3.19' into release-3.20Brad King2021-03-240-0/+0
|\ \
| * \ Merge branch 'backport-3.19-ci-msvc-14.28-16.9' into release-3.19Brad King2021-03-241-4/+4
| |\ \
* | \ \ Merge topic 'ci-msvc-14.28-16.9' into release-3.20Brad King2021-03-241-4/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'backport-3.19-ci-msvc-14.28-16.9' into ci-msvc-14.28-16.9Brad King2021-03-241-4/+4
| |\ \ \ |/ / / / | | | _
| * | gitlab-ci: Update Windows builds to MSVC 19.28-16.9 toolsetBrad King2021-03-241-4/+4
| |/
* | CMake 3.20.0v3.20.0Brad King2021-03-231-1/+1
* | Merge topic 'doc-xcoff-chrpath' into release-3.20Brad King2021-03-231-6/+13
|\ \
| * | Help: CMAKE_NO_BUILTIN_CHRPATH applies to XCOFF tooCraig Scott2021-03-221-6/+13
|/ /
* | Merge topic 'schema-typo' into release-3.20Brad King2021-03-191-15/+15
|\ \
| * | Help: Fix typos in presets schema field descriptionsAdriaan de Groot2021-03-181-15/+15
* | | Merge topic 'fix-CMP0118-NEW' into release-3.20Brad King2021-03-1923-102/+66
|\ \ \ | |/ / |/| |
| * | Help: Document CMP0118 requirement for boolean valuesBrad King2021-03-181-2/+8
| * | CMP0118: Fix NEW behavior when looking up target sourcesBrad King2021-03-1822-100/+58
|/ /
* | CMake 3.20.0-rc5v3.20.0-rc5Brad King2021-03-171-1/+1
* | Merge branch 'release-3.19' into release-3.20Brad King2021-03-170-0/+0
|\ \ | |/
| * Merge branch 'backport-3.19-ci-vs-16.8-in-16.9' into release-3.19Brad King2021-03-172-4/+4
| |\
| * \ Merge branch 'ninja-regenerate-no-recompact' into release-3.19Brad King2021-03-161-2/+3
| |\ \
| * \ \ Merge branch 'FindPkgConfig-NAMES_PER_DIR' into release-3.19Brad King2021-03-161-1/+4
| |\ \ \
* | \ \ \ Merge topic 'ninja-regenerate-no-recompact' into release-3.20Brad King2021-03-171-2/+3
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Ninja: Do not recompact deps log in regeneration during a buildBrad King2021-03-161-2/+3
| |/ / /
* | | | Merge topic 'FindPkgConfig-NAMES_PER_DIR' into release-3.20Brad King2021-03-171-1/+4
|\ \ \ \ | | |/ / | |/| |
| * | | FindPkgConfig: Restore preference for first pkg-config in PATHBrad King2021-03-161-1/+4
| |/ /
* | | Merge branch 'ci-vs-16.8-in-16.9' into release-3.20Brad King2021-03-170-0/+0
|\ \ \
| * \ \ Merge branch 'backport-3.19-ci-vs-16.8-in-16.9' into ci-vs-16.8-in-16.9Brad King2021-03-170-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | gitlab-ci: Fix using VS 16.8 toolset under VS 16.9 in CMake 3.19 branchBrad King2021-03-172-4/+4
| | |/
* | | Merge branch 'invalid-configure-preset' into release-3.20Brad King2021-03-1718-14/+62
|\ \ \
| * | | Tests: update tests to catch invalid configurePreset at read-timeSam Freed2021-03-1516-10/+49
| * | | Fail at read-time if configurePreset field invalidSam Freed2021-03-152-4/+13
* | | | Merge topic 'FindOpenMP-IntelLLVM-Windows' into release-3.20Brad King2021-03-171-1/+6
|\ \ \ \
| * | | | FindOpenMP: Use -Qiopenmp instead of -fiopenmp for IntelLLVM on WindowsWilliam R. Dieter2021-03-151-1/+6
| |/ / /
* | | | Merge topic 'FindMatlab-r2021a' into release-3.20Brad King2021-03-161-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | FindMatlab: R2021a version mapMichael Hirsch2021-03-151-0/+1
* | | | Merge topic 'ci-vs-16.8-in-16.9' into release-3.20Brad King2021-03-152-4/+4
|\ \ \ \ | | |/ / | |/| |
| * | | gitlab-ci: Fix using VS 16.8 toolset under VS 16.9Brad King2021-03-152-4/+4
|/ / /