summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Tests: Fix RunCMake.VsDotnetSdk with VS >= 17.3 on ARM64Anthony Roberts2022-10-281-2/+8
| | | | | VS 17.3 provides an arm64-native version of the tool, but the test was looking for the x64 version.
* Merge topic 'FindGLUT-pkg-config' into release-3.25Brad King2022-10-281-3/+5
|\ | | | | | | | | | | | | 919ab832e8 FindGLUT: Fix regression when pkg-config is not available Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7840
| * FindGLUT: Fix regression when pkg-config is not availableBrad King2022-10-271-3/+5
| | | | | | | | | | | | | | | | | | In commit a2fc4b6257 (FindGLUT: Drop the now-unnecessary exclusion of pkg-config for multiconfig, 2022-10-13, v3.25.0-rc2~16^2) we accidentally removed the entire condition around the `pkg-config` code path instead of just the multi-config part. Fixes: #24095
* | Merge topic 'vs-dotnet-sdk-output-paths' into release-3.25Brad King2022-10-281-1/+2
|\ \ | | | | | | | | | | | | | | | | | | d2d1be0671 VS: Fix paths in multi-target SDK-style projects Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7836
| * | VS: Fix paths in multi-target SDK-style projectsSebastian Maisch2022-10-271-1/+2
| |/ | | | | | | | | | | | | | | | | | | Set the `AppendTargetFrameworkToOutputPath` property to `false` only for single target SDK-style projects. This prevents outputs from being overwritten during the build. This revises commit 7671d71299 (VS: Fix target output paths in SDK-style projects, 2022-09-23, v3.25.0-rc1~82^2). Fixes: #24094 Issue: #23989
* | Merge topic 'xcode-restore-install-path' into release-3.25Brad King2022-10-281-3/+3
|\ \ | | | | | | | | | | | | | | | | | | 8d5631f0d0 Xcode: Revert "Don't set INSTALL_PATH unless target is SHARED_LIBRARY" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7839
| * | Xcode: Revert "Don't set INSTALL_PATH unless target is SHARED_LIBRARY"Brad King2022-10-271-3/+3
| |/ | | | | | | | | | | | | | | | | The change in commit 61acaa12af (xcode: Don't set INSTALL_PATH unless target is SHARED_LIBRARY, 2022-07-14, v3.25.0-rc1~291^2) breaks some existing use cases. Revert it pending further investigation. Fixes: #24087 Issue: #15183
* | Merge topic 'doc-config-postfix' into release-3.25Craig Scott2022-10-281-5/+5
|\ \ | |/ |/| | | | | | | | | 3fc2dcd801 Help: Minor formatting and cross-ref cleanup for <CONFIG>_POSTFIX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7841
| * 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
|\ | | | | | | | | | | | | | | | | | | | | 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 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
| * | 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 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
| * | | 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 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
| * | | | 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.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-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.23Brad King2022-10-276-14/+22
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !7833
| * | \ \ \ \ \ \ Merge branch 'ninja-intl-paths' into release-3.24Brad King2022-10-276-14/+22
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | Merge-request: !7833
* | | | | | | | | 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
| * | | | | | | | 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 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
| * | | | | | | | 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 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
| * | | | | | 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
* | | | | | 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
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'try_compile-CMP0128' into release-3.23Brad King2022-10-241-4/+5
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !7821
| * | \ \ \ \ Merge branch 'try_compile-CMP0128' into release-3.24Brad King2022-10-251-4/+5
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | Merge-request: !7821
* | | | | | | 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
| * | | | | Tests: Avoid running C++11 test on GNU < 4.7Brad King2022-10-241-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test added in commit 50e90e2828 (try_compile: Honor CMP0128 setting in test project, 2022-10-18, v3.25.0-rc2~4^2) requires that the compiler support C++11 mode, so do not run it on GNU compilers that are too old.
* | | | | | Merge topic 'doc-presets' into release-3.25Brad King2022-10-252-9/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a413eb8d0 Help: State default preset strategy for architecture and toolset 8de977fa70 Help: Use array consistently in presets manual e11773e8cf Help: Fix trivial typos related to presets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7817
| * | | | | | Help: State default preset strategy for architecture and toolsetCraig Scott2022-10-221-0/+3
| | | | | | |
| * | | | | | Help: Use array consistently in presets manualCraig Scott2022-10-221-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When referring to data in a JSON array, use "array" consistently rather than "list". This avoids ambiguity over whether we mean a string containing a CMake list, or a JSON array. Fixes: #24074
| * | | | | | Help: Fix trivial typos related to presetsCraig Scott2022-10-222-2/+2
| | | | | | |
* | | | | | | Merge topic 'nsis-licence-bom' into release-3.25Brad King2022-10-251-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b276d9d8f1 CPack/NSIS: Document BOM mark for UTF-8 encoded LICENSE file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7820
| * | | | | | | CPack/NSIS: Document BOM mark for UTF-8 encoded LICENSE fileMojca Miklavec2022-10-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this requirement was only mentioned in the 3.20 release notes.
* | | | | | | | Merge branch 'release-3.24' into release-3.25Brad King2022-10-250-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 'flang-windows' into release-3.24Brad King2022-10-241-0/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | Merge-request: !7818
* | | | | | | | Merge topic 'flang-windows' into release-3.25Brad King2022-10-251-0/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | 166bc00399 LLVMFlang: Add a required line to define linking rules on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7818
| * | | | | | LLVMFlang: Add a required line to define linking rules on Windowsمهدي شينون (Mehdi Chinoune)2022-10-241-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | This was missed in commit d34e5a98b8 (LLVMFlang: Add support for Windows, 2022-09-18, v3.25.0-rc1~102^2).
* | | | | | Merge topic 'cmake-presets-list-workflow-type' into release-3.25Brad King2022-10-241-0/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 75cfbef780 cmake: Support --list-presets=workflow Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Tested-by: Craig Scott <craig.scott@crascit.com> Merge-request: !7816
generated by cgit v0.12 at 2025-03-17 10:02:22 (GMT)