summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream-curl' into update-curlBrad King2022-10-31348-4295/+8246
|\
| * curl 2022-10-26 (cd95ee9f)Curl Upstream2022-10-31348-4285/+8247
* | curl: Update script to get curl 7.86.0Brad King2022-10-311-1/+1
* | Merge topic 'file-download-log-with-hash' into release-3.25Brad King2022-10-311-5/+7
|\ \
| * | file(DOWNLOAD): Fix LOG with EXPECTED_HASH on download failureAurelien Regat-Barrel2022-10-301-5/+7
* | | Merge topic 'ArchLinux-lib-dir' into release-3.25Brad King2022-10-311-3/+8
|\ \ \
| * | | Linux: Avoid finding libraries using lib64 on ArchLinuxLetu Ren2022-10-301-3/+8
| |/ /
* | | Merge topic 'vs-dotnetsdk-arm64' into release-3.25Brad King2022-10-311-2/+8
|\ \ \
| * | | Tests: Fix RunCMake.VsDotnetSdk with VS >= 17.3 on ARM64Anthony Roberts2022-10-281-2/+8
| |/ /
* | | Merge topic 'ninja-showIncludes-encoding' into release-3.25Brad King2022-10-3118-35/+128
|\ \ \
| * | | cmGeneratedFileStream: Drop unused WriteRaw methodBrad King2022-10-302-23/+1
| * | | Ninja: Match showIncludes dependencies using console output code pageBrad King2022-10-3014-22/+110
| * | | cm_codecvt: Add support for the Windows console output code pageBrad King2022-10-292-1/+8
| * | | cmGeneratedFileStream: Add support for a temporary alternate encodingBrad King2022-10-292-0/+20
| |/ /
* | | Merge topic 'xcode-obj-dir' into release-3.25Brad King2022-10-319-16/+44
|\ \ \ | |/ / |/| |
| * | Xcode: Put object files in a place that Xcode cleansBrad King2022-10-289-16/+44
|/ /
* | Merge topic 'FindGLUT-pkg-config' into release-3.25Brad King2022-10-281-3/+5
|\ \
| * | FindGLUT: Fix regression when pkg-config is not availableBrad King2022-10-271-3/+5
* | | Merge topic 'vs-dotnet-sdk-output-paths' into release-3.25Brad King2022-10-281-1/+2
|\ \ \
| * | | VS: Fix paths in multi-target SDK-style projectsSebastian Maisch2022-10-271-1/+2
| |/ /
* | | Merge topic 'xcode-restore-install-path' into release-3.25Brad King2022-10-281-3/+3
|\ \ \
| * | | Xcode: Revert "Don't set INSTALL_PATH unless target is SHARED_LIBRARY"Brad King2022-10-271-3/+3
| |/ /
* | | Merge topic 'doc-config-postfix' into release-3.25Craig Scott2022-10-281-5/+5
|\ \ \ | |/ / |/| |
| * | Help: Minor formatting and cross-ref cleanup for <CONFIG>_POSTFIXCraig Scott2022-10-271-5/+5
|/ /
* | Merge topic 'cmake-presets-workflow-arguments' into release-3.25Brad King2022-10-2710-15/+101
|\ \
| * | cmake --workflow: add --fresh optionKyle Edwards2022-10-267-10/+68
| * | cmake::Workflow: Refactor to use enum class argumentKyle Edwards2022-10-263-7/+17
| * | cmake --workflow: print usage and exit on unrecognized argumentKyle Edwards2022-10-265-0/+11
| * | cmake --workflow: print usage messageKyle Edwards2022-10-251-1/+8
* | | Merge topic 'xcode-swift-defs' into release-3.25Brad King2022-10-274-11/+66
|\ \ \
| * | | Xcode: Evaluate Swift compile definitions separatelyBrad King2022-10-254-11/+66
* | | | Merge topic 'tutorial_my_math_consistency' into release-3.25Brad King2022-10-274-10/+11
|\ \ \ \
| * | | | Tutorial: Restore USE_MYMATH in place of MY_MATHMarkus Ferrell2022-10-254-10/+11
* | | | | Merge topic 'vs-nostdlib-flag-table' into release-3.25Brad King2022-10-277-21/+21
|\ \ \ \ \
| * | | | | VS: Fix MSBuild property for nostdlib flagMis, Piotr2022-10-257-21/+21
| | |/ / / | |/| | |
* | | | | Merge branch 'release-3.24' into release-3.25Brad King2022-10-270-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'cpack-trace-argument' into release-3.24Brad King2022-10-271-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'vswhere-support-x86' into release-3.24Brad King2022-10-271-2/+21
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'release-3.23' into release-3.24Brad King2022-10-270-0/+0
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'ninja-intl-paths' into release-3.23Brad King2022-10-276-14/+22
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge branch 'ninja-intl-paths' into release-3.24Brad King2022-10-276-14/+22
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
* | | | | | | | | | Merge topic 'cpack-trace-argument' into release-3.25Brad King2022-10-271-2/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | CPack: Require no argument for --trace and --trace-expandKyle Edwards2022-10-251-2/+2
* | | | | | | | | | Merge topic 'vswhere-support-x86' into release-3.25Brad King2022-10-271-2/+21
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | VS: Fix crash finding vswhere on 32-bit WindowsBrad King2022-10-261-2/+21
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'ninja-intl-paths' into release-3.25Brad King2022-10-276-14/+22
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | / / / | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Tests: Add case for ninja with non-ascii charsBrad King2022-10-264-0/+22
| * | | | | | | Ninja: Restore support for non-ascii paths on Windows with ninja<=1.10Brad King2022-10-262-14/+0
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'release-3.24' into release-3.25Brad King2022-10-250-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'release-3.23' into release-3.24Brad King2022-10-250-0/+0
| |\ \ \ \ \ \ | | |/ / / / /