summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* VS: Fix pre-VS15.8 unity build exclusion of per-config sourcesBrad King2021-11-111-1/+1
| | | | | | | | | In a unity build, the original source files need to be excluded from the build. Prior to VS 15.8, this is done via `ExcludeFromBuild`, which is the same mechanism used to implement per-config sources. Fix a conflict in the implementation of the two features so that unity-batched sources are excluded from all configurations rather than just those in which they would otherwise have been included.
* cmLocalGenerator: Add dedicated types to hold unity source infoBrad King2021-11-112-44/+81
|
* cmLocalGenerator: Clarify name of method to write unity source include linesBrad King2021-11-102-10/+11
|
* cmLocalGenerator: Simplify unity source copy-if-different logicBrad King2021-11-101-13/+8
|
* cmLocalGenerator: De-duplicate unity source file generationBrad King2021-11-102-40/+40
|
* Merge topic 'cuda_clang_cmp0105'Brad King2021-11-0913-96/+105
|\ | | | | | | | | | | | | | | | | | | 4707ecbe6f CUDA: Support CMP0105 on Clang 15fde4c420 CUDA: Use local shorthands for variables in Clang device link code cf7e68087d CUDA: Avoid unnecessary allocation and GetLinkLanguage() 5b0693411e CUDA: Ignore USE_WATCOM_QUOTE for device link rules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6709
| * CUDA: Support CMP0105 on ClangRaul Tambre2021-11-089-33/+66
| | | | | | | | | | | | | | Add link flags during the "device compile" step. Enabled the relevant tests. The disable reasons regarding separable compilation were outdated and the actual failure case was device link flags support.
| * CUDA: Use local shorthands for variables in Clang device link codeRaul Tambre2021-11-072-26/+22
| | | | | | | | Helps reduce wrapping of lines making code more readable.
| * CUDA: Avoid unnecessary allocation and GetLinkLanguage()Raul Tambre2021-11-073-16/+12
| | | | | | | | | | There's no reason to allocate the cmNinjaLinkLineDeviceComputer on the heap. We can also assume the link language as CUDA in cmLocalGenerator::GetDeviceLinkFlags().
| * CUDA: Ignore USE_WATCOM_QUOTE for device link rulesRaul Tambre2021-11-073-22/+6
| | | | | | | | It's useless as the Watcom compiler isn't supported by NVCC.
* | Merge branch 'release-3.22'Brad King2021-11-090-0/+0
|\ \
| * \ Merge topic 'nmc-reuse-from' into release-3.22Brad King2021-11-091-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 244550997f PCH: Fixed Ninja Multi-Config and REUSE_FROM for MSVC Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6713
* | \ \ Merge topic 'nmc-reuse-from'Brad King2021-11-091-3/+3
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 244550997f PCH: Fixed Ninja Multi-Config and REUSE_FROM for MSVC Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6713
| * | | PCH: Fixed Ninja Multi-Config and REUSE_FROM for MSVCCristian Adam2021-11-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The copy_idb_pdb.cmake script would be executed for every configuration for all configurations. Debug would still want to get the RelWithDebInfo files, and the other way around.
* | | | Merge branch 'release-3.22'Brad King2021-11-090-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'msvc-pch-reuse-config' into release-3.22Brad King2021-11-091-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95fa27d94d PCH: Fix REUSE_FROM when Debug and RelWithDebInfo configs differ Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6712
* | \ \ \ Merge topic 'msvc-pch-reuse-config'Brad King2021-11-091-2/+2
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 95fa27d94d PCH: Fix REUSE_FROM when Debug and RelWithDebInfo configs differ Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6712
| * | | | PCH: Fix REUSE_FROM when Debug and RelWithDebInfo configs differCristian Adam2021-11-081-2/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | If the Debug configuration contains `/ZI` but the RelWithDebInfo doesn't then the copy_pdb_idb.cmake script will cause problems due to the fact that it was common for both configurations but they are incompatible with each other.
* | | | 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
generated by cgit v0.12 at 2025-01-31 21:34:04 (GMT)