summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cmake-presets-workflow-arguments'Brad King2022-10-2710-15/+101
|\ | | | | | | | | | | | | | | | | | | | | 7ecbe324b0 cmake --workflow: add --fresh option 7d9aa0f00c cmake::Workflow: Refactor to use enum class argument 322193afcd cmake --workflow: print usage and exit on unrecognized argument 70aef29427 cmake --workflow: print usage message Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7825
| * cmake --workflow: add --fresh optionKyle Edwards2022-10-267-10/+68
| | | | | | | | Fixes: #24073
| * 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
| | | | | | | | Issue: #24073
| * cmake --workflow: print usage messageKyle Edwards2022-10-251-1/+8
| |
* | Merge branch 'release-3.25'Brad King2022-10-270-0/+0
|\ \
| * \ Merge topic 'xcode-swift-defs' into release-3.25Brad King2022-10-274-11/+66
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | c0dd3dd2c1 Xcode: Evaluate Swift compile definitions separately Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7826
* | \ \ Merge topic 'xcode-swift-defs'Brad King2022-10-274-11/+66
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | c0dd3dd2c1 Xcode: Evaluate Swift compile definitions separately Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7826
| * | | Xcode: Evaluate Swift compile definitions separatelyBrad King2022-10-254-11/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode has a separate setting for Swift compile definitions, so we can compute a dedicated value for it. Therefore we can: * Support the COMPILE_LANGUAGE generator expression for Swift-specific filters. * Avoid passing the `=value` part of definitions, which Swift does not support. This revises commit 5cb625eb2f (Xcode: Pass compile definitions to Swift, 2022-06-19, v3.25.0-rc1~493^2) and reverts commit 12c6fec6b4 (Xcode: Drop CMAKE_INTDIR= definition in Swift targets, 2022-09-30, v3.25.0-rc1~60^2~2), as the latter is no longer needed. Fixes: #24086
* | | | Merge branch 'release-3.25'Brad King2022-10-270-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'tutorial_my_math_consistency' into release-3.25Brad King2022-10-274-10/+11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 277fbb3035 Tutorial: Restore USE_MYMATH in place of MY_MATH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7829
* | \ \ \ Merge topic 'tutorial_my_math_consistency'Brad King2022-10-274-10/+11
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 277fbb3035 Tutorial: Restore USE_MYMATH in place of MY_MATH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7829
| * | | | Tutorial: Restore USE_MYMATH in place of MY_MATHMarkus Ferrell2022-10-254-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 80f5d28813 (Tutorial: Update step 2 style, 2022-07-25, v3.25.0-rc1~226^2) we replaced some uses of `USE_MYMATH` with `MY_MATH`. Restore the former name for consistency with the rest of the tutorial.
* | | | | Merge branch 'release-3.25'Brad King2022-10-270-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'vs-nostdlib-flag-table' into release-3.25Brad King2022-10-277-21/+21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9c33824474 VS: Fix MSBuild property for nostdlib flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7823
* | \ \ \ \ Merge topic 'vs-nostdlib-flag-table'Brad King2022-10-277-21/+21
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 9c33824474 VS: Fix MSBuild property for nostdlib flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7823
| * | | | | VS: Fix MSBuild property for nostdlib flagMis, Piotr2022-10-257-21/+21
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The C# flag table added by commit 9b06c22648 (VS: Add flag tables for C#, 2016-12-01, v3.8.0-rc1~230^2) and preserved by commit 6e947179a8 (Add json flag tables for C#, 2018-11-21, v3.14.0-rc1~282^2~27) was written by hand. Fix the entry name for the `NoStdLib` property. Fixes: #24077
* | | | | Merge branch 'release-3.25'Brad King2022-10-270-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'release-3.24' into release-3.25Brad King2022-10-270-0/+0
| |\ \ \ \
* | \ \ \ \ Merge branch 'release-3.24'Brad King2022-10-270-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'cpack-trace-argument' into release-3.24Brad King2022-10-271-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !7824
| * \ \ \ \ \ Merge branch 'vswhere-support-x86' into release-3.24Brad King2022-10-271-2/+21
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !7832
| * \ \ \ \ \ \ Merge branch 'release-3.23' into release-3.24Brad King2022-10-270-0/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ninja-intl-paths' into release-3.24Brad King2022-10-276-14/+22
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !7833
* | \ \ \ \ \ \ \ \ Merge branch 'release-3.23'Brad King2022-10-270-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'ninja-intl-paths' into release-3.23Brad King2022-10-276-14/+22
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | Merge-request: !7833
* | | | | | | | | | Merge branch 'release-3.25'Brad King2022-10-270-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'cpack-trace-argument' into release-3.25Brad King2022-10-271-2/+2
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b5ebaa0d9c CPack: Require no argument for --trace and --trace-expand Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7824
* | | | | | | | | | Merge topic 'cpack-trace-argument'Brad King2022-10-271-2/+2
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b5ebaa0d9c CPack: Require no argument for --trace and --trace-expand Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7824
| * | | | | | | | | CPack: Require no argument for --trace and --trace-expandKyle Edwards2022-10-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was accidentally broken by commit 87c762d435 (CPack: Use cmCommandLineArgument instead of cmsys::CommandLineArguments, 2022-04-18, v3.24.0-rc1~258^2). Fixes: #24085
* | | | | | | | | | Merge branch 'release-3.25'Brad King2022-10-270-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'vswhere-support-x86' into release-3.25Brad King2022-10-271-2/+21
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6eee8c9000 VS: Fix crash finding vswhere on 32-bit Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7832
* | | | | | | | | | Merge topic 'vswhere-support-x86'Brad King2022-10-271-2/+21
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6eee8c9000 VS: Fix crash finding vswhere on 32-bit Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7832
| * | | | | | | | | VS: Fix crash finding vswhere on 32-bit WindowsBrad King2022-10-261-2/+21
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit f85913fa08 (VS: Add support for enumerating VS instances with vswhere, 2022-04-11, v3.24.0-rc1~282^2), if the COM lookup does not report any VS instances, we fall back to finding vswhere. However, the `getenv` call returns nullptr if the `ProgramFiles(x86)` environment variable is not set. Update the logic to tolerate not-set environment variables. Also check the plain `ProgramFiles` environment variable. Fixes: #24090
* | | | | | | | | Merge branch 'release-3.25'Brad King2022-10-270-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'ninja-intl-paths' into release-3.25Brad King2022-10-276-14/+22
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | / / | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a12050666c Tests: Add case for ninja with non-ascii chars 02a04dd9c7 Ninja: Restore support for non-ascii paths on Windows with ninja<=1.10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7833
* | | | | | | | Merge topic 'ninja-intl-paths'Brad King2022-10-276-14/+22
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a12050666c Tests: Add case for ninja with non-ascii chars 02a04dd9c7 Ninja: Restore support for non-ascii paths on Windows with ninja<=1.10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7833
| * | | | | | | Tests: Add case for ninja with non-ascii charsBrad King2022-10-264-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #24089
| * | | | | | | Ninja: Restore support for non-ascii paths on Windows with ninja<=1.10Brad King2022-10-262-14/+0
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit bbdb000c55 (GlobalNinjaGenerator: enlarge file stream buffer, 2022-01-25, v3.23.0-rc1~68^2). Somehow `rdbuf()->pubsetbuf()` is resetting our imbued locale and `cm_codecvt` that handles encoding. Fixes: #24089
* | | | | | | CMake Nightly Date StampKitware Robot2022-10-271-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2022-10-261-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.25'Brad King2022-10-250-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'release-3.24' into release-3.25Brad King2022-10-250-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
* | | | | | | Merge branch 'release-3.24'Brad King2022-10-250-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'release-3.23' into release-3.24Brad King2022-10-250-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'try_compile-CMP0128' into release-3.24Brad King2022-10-251-4/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !7821
* | \ \ \ \ \ \ Merge branch 'release-3.23'Brad King2022-10-250-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'try_compile-CMP0128' into release-3.23Brad King2022-10-241-4/+5
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | Merge-request: !7821
* | | | | | | | Merge branch 'release-3.25'Brad King2022-10-250-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge topic 'try_compile-CMP0128' into release-3.25Brad King2022-10-251-4/+5
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | / / | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | 90287792b6 Tests: Avoid running C++11 test on GNU < 4.7 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7821