summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'verify-interface-header-sets-add-compile-definitions' into ↵Brad King2022-07-286-29/+68
|\ | | | | | | | | | | | | | | | | | | release-3.24 27fd172d8d VERIFY_INTERFACE_HEADER_SETS: Finalize compile info for verify targets 626e641a19 cmTarget: Factor out FinalizeTargetCompileInfo() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7516
| * VERIFY_INTERFACE_HEADER_SETS: Finalize compile info for verify targetsKyle Edwards2022-07-273-0/+12
| | | | | | | | Fixes: #23732
| * cmTarget: Factor out FinalizeTargetCompileInfo()Kyle Edwards2022-07-273-29/+56
| |
* | Merge topic 'vs-msbuild-arm64' into release-3.24Brad King2022-07-281-36/+90
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 418fd85569 VS: Detect ARM64 host architecture at runtime Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Tommy Vercetti <tommyvct@outlook.com> Acked-by: Anton Lapounov <anton.lapounov@microsoft.com> Merge-request: !7511
| * | VS: Detect ARM64 host architecture at runtimeBrad King2022-07-271-36/+90
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use the host machine's architecture to select the `MSBuild.exe` binary variant, and the host toolset architecture. When CMake is compiled as `x64` or `x86` it may still run on ARM64 hosts. Detect the actual architecture of the host at runtime instead of relying on the architecture of CMake's own binary. The `arm64/MSBuild.exe` executable is an ARM64 .NET 4 application, which requires the ARM64 version of .NET Framework 4.8.1 to be installed on the machine. That version is not yet released for Windows 10; however, the `MSBuild/Current/Bin/arm64` directory is still created when installing Visual Studio 2022 (a user may upgrade to Windows 11 later). Use it only if the .NET Framework is installed. The `amd64/MSBuild.exe` executable cannot run on Windows 10 ARM64, but can run on Windows 11 ARM64. Fixes: #23755
* | Merge topic 'refactor-win-ver' into release-3.24Brad King2022-07-263-31/+52
|\ \ | | | | | | | | | | | | | | | | | | ee047a68f2 cmSystemTools: Factor out method to get Windows OS version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7509
| * | cmSystemTools: Factor out method to get Windows OS versionBrad King2022-07-253-31/+52
| | | | | | | | | | | | Factor the implementation out of `cmGlobalGenerator`.
* | | Merge topic 'doc-if-PATH_EQUAL' into release-3.24Brad King2022-07-262-9/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 37e01773e4 Help: Clarify behavior of path-based equality conditions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7503
| * | | Help: Clarify behavior of path-based equality conditionsCraig Scott2022-07-242-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The docs for if(PATH_EQUAL) did not mention the component-wise nature of the checks. It also claimed no normalization was performed, but multiple separators are effectively collapsed (part of normalization). Improve the wording to clarify both of these points. Also update the corresponding description of cmake_path(COMPARE), which had the same inaccuracy. Fixes: #23758
* | | | Merge topic 'verify-interface-header-sets-interface-libraries' into release-3.24Brad King2022-07-261-7/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f5dd1817d1 Help: Clarify that VERIFY_INTERFACE_HEADER_SETS supports interface libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7507
| * | | | Help: Clarify that VERIFY_INTERFACE_HEADER_SETS supports interface librariesKyle Edwards2022-07-251-7/+7
| | |_|/ | |/| |
* | | | Merge topic 'FindVulkan-relnotes' into release-3.24Brad King2022-07-262-4/+27
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 0b538e4002 FindVulkan: Add missing 3.24 release notes db66c384fc FindVulkan: Format component documentation as definition list Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7502
| * | | FindVulkan: Add missing 3.24 release notesMACHIZAUD Andréa2022-07-252-0/+7
| | | |
| * | | FindVulkan: Format component documentation as definition listBrad King2022-07-251-4/+20
| |/ /
* | | Merge topic 'doc-find_package-BYPASS_PROVIDER' into release-3.24Brad King2022-07-252-3/+13
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | 4f7a0c25d2 Help: Document BYPASS_PROVIDER keyword for find_package() 76370e06b8 Help: Minor grammar fix for the Using Dependencies manual Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7501
| * | Help: Document BYPASS_PROVIDER keyword for find_package()Craig Scott2022-07-231-2/+12
| | | | | | | | | Fixes: #23669
| * | Help: Minor grammar fix for the Using Dependencies manualCraig Scott2022-07-231-1/+1
| |/
* | Merge topic 'cmake-help-flags-after-dashdash' into release-3.24Brad King2022-07-254-4/+6
|\ \ | | | | | | | | | | | | | | | | | | 14a0e750cb cmake: In -P mode ignore flags like `--version` after `--` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7496
| * | cmake: In -P mode ignore flags like `--version` after `--`Robert Maynard2022-07-224-4/+6
| | | | | | | | | | | | Fixes: #21031
* | | Merge branch 'release-3.23' into release-3.24Brad King2022-07-250-0/+0
|\ \ \
| * \ \ Merge branch 'backport-3.23-cmake-P-path-args' into release-3.23Brad King2022-07-224-18/+22
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !7494
* | \ \ \ Merge topic 'cmake-P-path-args' into release-3.24Brad King2022-07-254-13/+23
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | febe3190f0 Merge branch 'backport-3.23-cmake-P-path-args' 846a650ff7 cmake: In -P mode ignore extra paths on the command line c362cba566 cmake: simplify to a single source of truth of working mode 261fa5db39 cmake: In -P mode ignore extra paths on the command line 314135cdf1 cmake: simplify to a single source of truth of working mode Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7494
| * | | | Merge branch 'backport-3.23-cmake-P-path-args'Brad King2022-07-220-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | cmake: In -P mode ignore extra paths on the command lineRobert Maynard2022-07-224-1/+15
| | | | | | | | | | | | | | | | | | | | Fixes: #23748
| | * | | cmake: simplify to a single source of truth of working modeRobert Maynard2022-07-221-17/+7
| | |/ /
| * | | cmake: In -P mode ignore extra paths on the command lineRobert Maynard2022-07-224-1/+15
| | | | | | | | | | | | | | | | Fixes: #23748
| * | | cmake: simplify to a single source of truth of working modeRobert Maynard2022-07-221-12/+8
| | | |
* | | | Merge topic 'revert-vs-ZERO_CHECK-proj' into release-3.24Brad King2022-07-254-251/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 289932ded0 VS: Revert "Write ZERO_CHECK.proj for VS19 and above" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7499
| * | | | VS: Revert "Write ZERO_CHECK.proj for VS19 and above"Brad King2022-07-224-251/+34
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit a334f1b906 (VS: Write ZERO_CHECK.proj for VS19 and above, 2021-12-24, v3.24.0-rc1~607^2) and a supporting change from commit 7219988b00 (VS: Exclude ZERO_CHECK.proj from .sln for include_external_msproject, 2022-07-15, v3.24.0-rc4~1^2). The change was made to support `dotnet` tooling in addition to `msbuild`. However, not having `ZERO_CHECK` in the `.sln` breaks common interactive workflows. Revert the change for now. Later it can be re-introduced behind some kind of option that enables `dotnet` support. Fixes: #23726 Issue: #20227
* | | | Merge topic 'revert-ui-check' into release-3.24Brad King2022-07-251-16/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 778aaf6fdc AUTOUIC: Revert "Fix internal paths of generated ui_foo.h files" Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7498
| * | | | AUTOUIC: Revert "Fix internal paths of generated ui_foo.h files"Brad King2022-07-221-16/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 10668f26c9 (AUTOUIC: Fix internal paths of generated ui_foo.h files, 2022-05-21, v3.24.0-rc3~20^2). It broke some existing projects that use more than one `.ui` file of the same name. Fixes: #23759 Issue: #23523
* | | | Merge topic 'doc-CMP0097-FetchContent' into release-3.24Craig Scott2022-07-251-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1796ffbde9 Help: CMP0097 applies to FetchContent as well Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7504
| * | | | Help: CMP0097 applies to FetchContent as wellCraig Scott2022-07-241-2/+4
| | |_|/ | |/| | | | | | | | | | The omission of FetchContent_Declare() in the original policy docs was just an oversight.
* | | | Merge topic 'doc-path-genex-corrections' into release-3.24Craig Scott2022-07-251-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | c7ab76e0ff Help: Fix wrong syntax for $<PATH:REPLACE_EXTENSION,...> Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7505
| * | | Help: Fix wrong syntax for $<PATH:REPLACE_EXTENSION,...>Craig Scott2022-07-241-1/+1
|/ / /
* | | Merge topic 'doc-execute_process' into release-3.24Brad King2022-07-201-2/+9
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 70c26a65b7 Help: Clarify execute_process OS-specific command-line encoding Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7492
| * | Help: Clarify execute_process OS-specific command-line encodingBrad King2022-07-201-2/+9
|/ / | | | | | | Issue: #23557
* | CMake 3.24.0-rc4v3.24.0-rc4Brad King2022-07-201-1/+1
| |
* | Merge topic 'vs-ZERO_CHECK-proj' into release-3.24Brad King2022-07-209-1/+63
|\ \ | | | | | | | | | | | | | | | | | | 7219988b00 VS: Exclude ZERO_CHECK.proj from .sln for include_external_msproject Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7478
| * | VS: Exclude ZERO_CHECK.proj from .sln for include_external_msprojectSumit Bhardwaj2022-07-209-1/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In `cmGlobalVisualStudio7Generator::WriteTargetsToSolution`, we skip writing `ZERO_CHECK.proj` to solution file as the check in `cmGlobalVisualStudioGenerator::IsInSolution` returns `false` for `ZERO_CHECK`. However, we write ZERO_CHECK to ProjectDependencies for external projects as there are no checks in `cmGlobalVisualStudio71Generator::WriteExternalProject`. Similar to `cmGlobalVisualStudioGenerator::IsInSolution`, we introduce `IsDepInSolution(const std::string&)` which excludes `ZERO_CHECK.proj` from being added to sln file for the cases where we have `ZERO_CHECK.proj`. Fixes: #23708
* | | Merge topic 'vs-csharp-debug-embedded' into release-3.24Brad King2022-07-207-0/+49
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fec515d5fb VS: Add CSharp flag table entry for '/debug:embedded' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7483
| * | | VS: Add CSharp flag table entry for '/debug:embedded'TheApplePieGod2022-07-207-0/+49
| | | | | | | | | | | | | | | | Fixes: #23713
* | | | Merge topic 'doc-example-target-sources' into release-3.24Brad King2022-07-201-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c7c5a50b97 Help: Add missing PRIVATE keyword to target_sources() example Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7490
| * | | | Help: Add missing PRIVATE keyword to target_sources() exampleCraig Scott2022-07-201-2/+2
| |/ / / | | | | | | | | Fixes: #23746
* | | | Merge topic 'doc-restructure-genex-manual' into release-3.24Brad King2022-07-201-915/+1007
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d6af935467 Help: Add Whitespace And Quoting section to genex manual 044c22e121 Help: Restructure reference sections of genex manual 3666486c28 Help: Move reference content to its own section at end of genex manual 22f8a626c3 Help: Add missing versionadded for CUDA genexes c57c3dbbec Help: Genex manual typo, grammar, formatting, wording fixes 2b102438f8 Help: Boolean genex conditions must evaluate to 1 or 0 d2cb36861f Help: Fix cross-references in genex manual that linked to wrong genexes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7479
| * | | Help: Add Whitespace And Quoting section to genex manualCraig Scott2022-07-191-0/+87
| | | |
| * | | Help: Restructure reference sections of genex manualCraig Scott2022-07-191-872/+866
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of the general restructuring, also move the notes of a more introductory nature out of what was the "String-Valued Generator Expressions" section and up to the dedicated Introduction. This gives the reader a bit more of a foundation before they get to the heavier detail of the reference section.
| * | | Help: Move reference content to its own section at end of genex manualCraig Scott2022-07-191-49/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This involves moving the Debugging section up to just after the introduction. The content of that section is unchanged. The reference section then follows, and since it is a dedicated section, all existing sections thereunder were demoted one level. Move the note about deviating from the usual CMake docs convention of using angle brackets around placeholders out of the Introduction and to the start of the reference section. No placeholders are used before that point, so that content no longer belongs in the introduction. Apply some minor wording cleanup to the content in the Introduction that remained.
| * | | Help: Add missing versionadded for CUDA genexesCraig Scott2022-07-191-0/+4
| | | |
| * | | Help: Genex manual typo, grammar, formatting, wording fixesCraig Scott2022-07-191-35/+35
| | | |