mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-01 03:29:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
55,270 Commits 2 Branches 401 Tags
4fd2d62613af072204910b303fc1506804279df1
Commit Graph

55270 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 4fd2d62613 Merge topic 'cuda_clang_cmp0105' 
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
 2021-11-09 07:56:21 -05:00
Brad King c478ea4dee Merge branch 'release-3.22' 2021-11-09 07:53:19 -05:00
Brad King 9fbbe29138 Merge topic 'nmc-reuse-from' 
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
 2021-11-09 07:53:19 -05:00
Brad King 95ea17dfd3 Merge topic 'nmc-reuse-from' into release-3.22 
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
 2021-11-09 07:53:18 -05:00
Brad King 2b5ed7cc3a Merge branch 'release-3.22' 2021-11-09 07:52:30 -05:00
Brad King 79c21dc9bd Merge topic 'msvc-pch-reuse-config' 
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
 2021-11-09 07:52:30 -05:00
Brad King 2eb96cbe41 Merge topic 'msvc-pch-reuse-config' into release-3.22 
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
 2021-11-09 07:52:29 -05:00
Brad King 626d8fbc09 Merge branch 'release-3.22' 2021-11-09 07:51:36 -05:00
Brad King 44967d400b Merge topic 'doc-preset-inheritance' 
6dc6412477 Help: Use stronger wording in rule about preset inheritance

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6710
 2021-11-09 07:51:36 -05:00
Brad King 44849f14b0 Merge topic 'doc-preset-inheritance' into release-3.22 
6dc6412477 Help: Use stronger wording in rule about preset inheritance

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6710
 2021-11-09 07:51:35 -05:00
Kitware Robot 0a68db7b25 CMake Nightly Date Stamp 2021-11-09 00:02:09 -05:00
Yonggang Luo 6dc6412477 Help: Use stronger wording in rule about preset inheritance 2021-11-08 17:00:08 -05:00
Raul Tambre 4707ecbe6f CUDA: Support CMP0105 on Clang 
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.
 2021-11-08 21:26:00 +02:00
Brad King 1fad699809 Merge topic 'target-sources-file-set' 
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
 2021-11-08 12:40:46 -05:00
Brad King befcd6ea1d Merge topic 'cpack-drop-osxx11' 
4ef974e6cb CPack: Remove undocumented deprecated OSXX11 generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6704
 2021-11-08 12:40:00 -05:00
Brad King 75d1f7aa2e Merge branch 'release-3.22' 2021-11-08 12:38:48 -05:00
Brad King c0e23058f6 Merge topic 'vs-framework-version' 
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
 2021-11-08 12:38:48 -05:00
Brad King 2b9b64269f Merge topic 'vs-framework-version' into release-3.22 
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
 2021-11-08 12:38:47 -05:00
Brad King 7d653059a5 Merge branch 'release-3.22' 2021-11-08 12:36:37 -05:00
Brad King e19b1b4a62 Merge topic 'doc-CUDA_STANDARD' 
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
 2021-11-08 12:36:37 -05:00
Brad King 5f215253a8 Merge topic 'doc-CUDA_STANDARD' into release-3.22 
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
 2021-11-08 12:36:36 -05:00
Cristian Adam 244550997f PCH: Fixed Ninja Multi-Config and REUSE_FROM for MSVC 
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.
 2021-11-08 18:16:36 +01:00
Cristian Adam 95fa27d94d PCH: Fix REUSE_FROM when Debug and RelWithDebInfo configs differ 
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.
 2021-11-08 16:51:18 +01:00
Craig Scott decbe2c371 Merge branch 'release-3.22' 2021-11-08 04:30:08 -05:00
Craig Scott 3ef926bb3a Merge topic 'doc-PKG_CONFIG_ARGN' 
76c0281421 Help: Clarify how PKG_CONFIG env var initializes cache vars

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6706
 2021-11-08 04:30:08 -05:00
Craig Scott e131e31e25 Merge topic 'doc-PKG_CONFIG_ARGN' into release-3.22 
76c0281421 Help: Clarify how PKG_CONFIG env var initializes cache vars

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6706
 2021-11-08 04:30:07 -05:00
Kitware Robot 8e752379ff CMake Nightly Date Stamp 2021-11-08 00:01:12 -05:00
Craig Scott 84667a6f3c Help: Clarify valid versus supported values for CUDA_STANDARD 
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
 2021-11-08 08:17:04 +11:00
Raul Tambre 15fde4c420 CUDA: Use local shorthands for variables in Clang device link code 
Helps reduce wrapping of lines making code more readable.
 2021-11-07 21:28:08 +02:00
Raul Tambre cf7e68087d CUDA: Avoid unnecessary allocation and GetLinkLanguage() 
There's no reason to allocate the cmNinjaLinkLineDeviceComputer on the heap.
We can also assume the link language as CUDA in cmLocalGenerator::GetDeviceLinkFlags().
 2021-11-07 21:28:08 +02:00
Raul Tambre 5b0693411e CUDA: Ignore USE_WATCOM_QUOTE for device link rules 
It's useless as the Watcom compiler isn't supported by NVCC.
 2021-11-07 21:28:08 +02:00
Craig Scott 76c0281421 Help: Clarify how PKG_CONFIG env var initializes cache vars 
Fixes: #22870
 2021-11-07 16:09:42 +11:00
Kitware Robot df2ffa30a7 CMake Nightly Date Stamp 2021-11-07 00:02:07 -04:00
Brad King d51246c662 VS: Default TargetFrameworkVersion to v4.7.2 for VS 2022 
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
 2021-11-06 06:08:55 -04:00
Brad King f97f8537f3 VS: Model a default target framework 
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
 2021-11-06 06:08:54 -04:00
Brad King e40cedddc0 cmVisualStudio10TargetGenerator: Refactor target framework selection 
Split the selection from the generation of the resulting element(s).
 2021-11-06 06:08:48 -04:00
Kitware Robot 30c0bc8cd7 CMake Nightly Date Stamp 2021-11-06 00:02:08 -04:00
Brad King 4ef974e6cb CPack: Remove undocumented deprecated OSXX11 generator 
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
 2021-11-05 12:39:22 -04:00
Brad King e0a66059d4 Help: Fix target_sources FILE_SET signature summary 
The `FILE_SET <set>` argument is required to activate this signature.
 2021-11-05 10:24:12 -04:00
Brad King 79d379fba6 Help: Add versionadded markup to target_sources FILE_SET feature 
This was accidentally left out of commit 4b0ee4e338 (Help: Add
documentation for target_sources(FILE_SET) and associated properties,
2021-07-02).
 2021-11-05 10:19:10 -04:00
Brad King 463e17b095 Merge branch 'release-3.22' 2021-11-05 10:09:28 -04:00
Brad King e479650b41 Merge topic 'nmc-cross-config-target-deps' 
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
 2021-11-05 10:09:28 -04:00
Brad King ced697d284 Merge topic 'nmc-cross-config-target-deps' into release-3.22 
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
 2021-11-05 10:09:27 -04:00
Brad King a62acb59f4 Merge branch 'release-3.22' 2021-11-05 10:07:58 -04:00
Brad King b75ffd5ee0 Merge topic 'CheckLinkerFlag-policies' 
58c8d649e1 CheckLinkerFlag: Set policies needed by the implementation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6701
 2021-11-05 10:07:58 -04:00
Brad King 2bd4e48486 Merge topic 'CheckLinkerFlag-policies' into release-3.22 
58c8d649e1 CheckLinkerFlag: Set policies needed by the implementation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6701
 2021-11-05 10:07:57 -04:00
Brad King 65ba25c2f8 Merge topic 'source-cleanup' 
b86b6aaa4a Source: Cleanup and simplify some code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6673
 2021-11-05 10:06:21 -04:00
Brad King 5ca6b724d3 Merge topic 'doc-SOURCES-genex' 
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
 2021-11-05 10:04:44 -04:00
Kitware Robot 3fe938801a CMake Nightly Date Stamp 2021-11-05 00:01:08 -04:00
Thomas Dickerson 58c8d649e1 CheckLinkerFlag: Set policies needed by the implementation 
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.
 2021-11-04 14:01:09 -04:00