summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-3.22'Brad King2021-11-090-0/+0
|\
| * Merge topic 'doc-preset-inheritance' into release-3.22Brad King2021-11-091-3/+3
| |\ | | | | | | | | | | | | | | | | | | 6dc6412477 Help: Use stronger wording in rule about preset inheritance Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6710
* | \ Merge topic 'doc-preset-inheritance'Brad King2021-11-091-3/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 6dc6412477 Help: Use stronger wording in rule about preset inheritance Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6710
| * | Help: Use stronger wording in rule about preset inheritanceYonggang Luo2021-11-081-3/+3
| |/
* | CMake Nightly Date StampKitware Robot2021-11-091-1/+1
| |
* | Merge topic 'target-sources-file-set'Brad King2021-11-088-2/+21
|\ \ | | | | | | | | | | | | | | | | | | | | | e0a66059d4 Help: Fix target_sources FILE_SET signature summary 79d379fba6 Help: Add versionadded markup to target_sources FILE_SET feature Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6703
| * | Help: Fix target_sources FILE_SET signature summaryBrad King2021-11-051-2/+2
| | | | | | | | | | | | The `FILE_SET <set>` argument is required to activate this signature.
| * | Help: Add versionadded markup to target_sources FILE_SET featureBrad King2021-11-058-0/+19
| | | | | | | | | | | | | | | | | | This was accidentally left out of commit 4b0ee4e338 (Help: Add documentation for target_sources(FILE_SET) and associated properties, 2021-07-02).
* | | Merge topic 'cpack-drop-osxx11'Brad King2021-11-0810-442/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4ef974e6cb CPack: Remove undocumented deprecated OSXX11 generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6704
| * | | CPack: Remove undocumented deprecated OSXX11 generatorBrad King2021-11-0510-442/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | This CPack generator was never documented, and has been deprecated since commit 2ed00e8ef8 (CPack: Deprecate OSXX11 generator, 2020-01-31, v3.17.0-rc1~45^2). Issue: #20235
* | | Merge branch 'release-3.22'Brad King2021-11-080-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'vs-framework-version' into release-3.22Brad King2021-11-0811-39/+182
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d51246c662 VS: Default TargetFrameworkVersion to v4.7.2 for VS 2022 f97f8537f3 VS: Model a default target framework e40cedddc0 cmVisualStudio10TargetGenerator: Refactor target framework selection 78782cc7dc cmGlobalVisualStudio8Generator: Refactor SetGeneratorPlatform Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6699
* | \ \ Merge topic 'vs-framework-version'Brad King2021-11-0811-39/+182
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d51246c662 VS: Default TargetFrameworkVersion to v4.7.2 for VS 2022 f97f8537f3 VS: Model a default target framework e40cedddc0 cmVisualStudio10TargetGenerator: Refactor target framework selection 78782cc7dc cmGlobalVisualStudio8Generator: Refactor SetGeneratorPlatform Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6699
| * | | VS: Default TargetFrameworkVersion to v4.7.2 for VS 2022Brad King2021-11-061-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSBuild defaults to v4.0 but VS 2022 does not install it anymore. Explicitly specify a newer framework version by default. Use a version that VS 2022 installs without selecting a separate component. Fixes: #22835
| * | | VS: Model a default target frameworkBrad King2021-11-0610-10/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add fields to the VS generator to select a target framework. Migrate the existing default for VS 12 .NET CF for Windows CE. Report the values in `CMAKE_VS_*` variables and use them for the CSharp compiler id project too. Issue: #22849
| * | | cmVisualStudio10TargetGenerator: Refactor target framework selectionBrad King2021-11-061-35/+53
| | | | | | | | | | | | | | | | Split the selection from the generation of the resulting element(s).
| * | | cmGlobalVisualStudio8Generator: Refactor SetGeneratorPlatformBrad King2021-11-031-4/+11
| | | | | | | | | | | | | | | | | | | | Re-organize the method to make room for additional `CMAKE_GENERATOR_PLATFORM` processing.
* | | | Merge branch 'release-3.22'Brad King2021-11-080-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'doc-CUDA_STANDARD' into release-3.22Brad King2021-11-081-5/+11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 84667a6f3c Help: Clarify valid versus supported values for CUDA_STANDARD Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !6707
* | \ \ \ Merge topic 'doc-CUDA_STANDARD'Brad King2021-11-081-5/+11
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 84667a6f3c Help: Clarify valid versus supported values for CUDA_STANDARD Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !6707
| * | | | Help: Clarify valid versus supported values for CUDA_STANDARDCraig Scott2021-11-071-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake 3.18 added the first support for any compiler for 17 and 20, but those were recognized as valid values in earlier CMake versions even though there was no compiler that supported them. Make this distinction clear to avoid creating the impression that these standards could be usefully used before CMake 3.18. While 98 is recognized as a valid value, it also just gets treated as 03 internally. Document this behavior as well. Fixes: #22711
* | | | | Merge branch 'release-3.22'Craig Scott2021-11-080-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'doc-PKG_CONFIG_ARGN' into release-3.22Craig Scott2021-11-081-16/+33
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 76c0281421 Help: Clarify how PKG_CONFIG env var initializes cache vars Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6706
* | | | | Merge topic 'doc-PKG_CONFIG_ARGN'Craig Scott2021-11-081-16/+33
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 76c0281421 Help: Clarify how PKG_CONFIG env var initializes cache vars Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6706
| * | | | Help: Clarify how PKG_CONFIG env var initializes cache varsCraig Scott2021-11-071-16/+33
| |/ / / | | | | | | | | Fixes: #22870
* | | | CMake Nightly Date StampKitware Robot2021-11-081-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2021-11-071-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2021-11-061-1/+1
| |_|/ |/| |
* | | Merge branch 'release-3.22'Brad King2021-11-050-0/+0
|\ \ \ | |/ /
| * | Merge topic 'nmc-cross-config-target-deps' into release-3.22Brad King2021-11-0511-13/+47
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95f44e00cd Ninja Multi-Config: Fix custom command target dependencies in cross-configs a883363935 Ninja Multi-Config: Fix internal cross-config target dependency ordering 16e24748c5 Ninja Multi-Config: Fix cross-config custom command dependency tracing Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6702
* | \ \ Merge topic 'nmc-cross-config-target-deps'Brad King2021-11-0511-13/+47
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95f44e00cd Ninja Multi-Config: Fix custom command target dependencies in cross-configs a883363935 Ninja Multi-Config: Fix internal cross-config target dependency ordering 16e24748c5 Ninja Multi-Config: Fix cross-config custom command dependency tracing Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6702
| * | | Ninja Multi-Config: Fix custom command target dependencies in cross-configsBrad King2021-11-046-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generator expressions in a non-cross custom command's `COMMAND` arguments are evaluated in the command config. Target-level dependencies implied by `TARGET_FILE` must therefore be cross dependencies. This is important to generate proper target-level dependencies on the cross-config build statements for the target to which the custom command is attached. Fixes: #22855
| * | | Ninja Multi-Config: Fix internal cross-config target dependency orderingBrad King2021-11-041-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 7abc3d61ac (Ninja Multi-Config: Fix issue with framework dependencies and Autogen, 2020-02-13, v3.17.0-rc2~18^2) the `cmLinkItem` comparison operator was updated to order identical strings by the cross-config boolean. We need to order identical targets that way too in order to represent both a cross and non-cross dependency on the same target. Issue: #22855
| * | | Ninja Multi-Config: Fix cross-config custom command dependency tracingBrad King2021-11-044-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Process `CMAKE_CROSS_CONFIGS` and friends to properly configure the generator for cross-config behavior before custom command dependency tracing.
* | | | Merge branch 'release-3.22'Brad King2021-11-050-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'CheckLinkerFlag-policies' into release-3.22Brad King2021-11-051-0/+6
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 58c8d649e1 CheckLinkerFlag: Set policies needed by the implementation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6701
* | | | Merge topic 'CheckLinkerFlag-policies'Brad King2021-11-051-0/+6
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 58c8d649e1 CheckLinkerFlag: Set policies needed by the implementation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6701
| * | | CheckLinkerFlag: Set policies needed by the implementationThomas Dickerson2021-11-041-0/+6
| |/ / | | | | | | | | | | | | | | | | | | The module was added in CMake 3.18 by commit af96c0f4fa (CheckLinkerFlag: Add module to check validity of linker flags, 2020-05-16, v3.18.0-rc1~103^2), but it is still possible for projects to use it without setting policies to the 3.18 version level.
* | | Merge topic 'source-cleanup'Brad King2021-11-0529-122/+90
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | b86b6aaa4a Source: Cleanup and simplify some code Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6673
| * | | Source: Cleanup and simplify some codeRose2021-11-0429-122/+90
| | | |
* | | | Merge topic 'doc-SOURCES-genex'Brad King2021-11-052-20/+65
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9fac18a4a6 Help: Clarify target_sources path conversion w.r.t generator expressions 9abd63dd3a Help: Explain how target SOURCES are interpreted Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Michael Hirsch <michael@scivision.dev> Merge-request: !6692
| * | | | Help: Clarify target_sources path conversion w.r.t generator expressionsArcturus Arcturus2021-11-041-18/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With some of the content expanded, reorder a few paragraphs and tweak some of the wording to improve the flow. Co-Authored-By: Craig Scott <craig.scott@crascit.com>
| * | | | Help: Explain how target SOURCES are interpretedArcturus Arcturus2021-11-021-2/+34
| | | | | | | | | | | | | | | Co-Authored-By: Craig Scott <craig.scott@crascit.com>
* | | | | CMake Nightly Date StampKitware Robot2021-11-051-1/+1
| | | | |
* | | | | Merge branch 'release-3.22'Brad King2021-11-040-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'release-3.21' into release-3.22Brad King2021-11-040-0/+0
| |\ \ \ \
* | \ \ \ \ Merge branch 'release-3.21'Brad King2021-11-040-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'doc-TARGET_RUNTIME_DLLS' into release-3.21Brad King2021-11-032-2/+14
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !6700
| * \ \ \ \ \ Merge branch 'msvc-cxx-modules-scanDependencies' into release-3.21Brad King2021-11-031-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !6696
| * \ \ \ \ \ \ Merge branch 'GNUtoMS-vs2022' into release-3.21Brad King2021-11-031-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !6695