mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-20 10:51:35 -05:00
Code Issues Packages Projects Releases Wiki Activity
56,621 Commits 2 Branches 394 Tags
a116fd413dee6e2b05f71477bd68e1aa062b8f61
Commit Graph

5819 Commits

Author SHA1 Message Date
Brad King
28f8b5cb0c Merge topic 'cmake-presets-file-dir' 
f54507c2f6 CMakePresets.json: Add ${fileDir} macro

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Gerhard Olsson <gerhard.nospam@gmail.com>
Merge-request: !7051
 2022-03-08 16:03:15 -05:00
Brad King
f78cd55453 Merge topic 'doc-lang-std-features' 
fbda79f39d Help: Document explicitly that 'cxx_std_##' features may not add a flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: antmak <antmak.pub@gmail.com>
Merge-request: !7043
 2022-03-08 08:25:20 -05:00
Kyle Edwards
f54507c2f6 CMakePresets.json: Add ${fileDir} macro 
Fixes: #23214
 2022-03-07 18:03:16 -05:00
Brad King
49642079e5 Merge topic 'LINK_LIBRARY-libraries' 
9fb1dff070 LINK_LIBRARY: Add features for library support on Apple
93a153bc7f Genx-LINK_LIBRARY: simplify framework features definitions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7029
 2022-03-07 10:04:13 -05:00
Brad King
7e807479ff Merge topic 'LINK_GROUP-rescan-static-libs' 
b0fada9964 Genex-LINK_GROUP: Add feature RESCAN

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7044
 2022-03-07 10:03:36 -05:00
Brad King
fbda79f39d Help: Document explicitly that 'cxx_std_##' features may not add a flag 
This is commonly reported incorrectly as a bug, so call out this
behavior explicitly in the documentation.
 2022-03-07 09:48:26 -05:00
Marc Chevrier
9fb1dff070 LINK_LIBRARY: Add features for library support on Apple 2022-03-05 13:57:45 +01:00
Marc Chevrier
b0fada9964 Genex-LINK_GROUP: Add feature RESCAN 
Feature RESCAN can be used to manage circular references between
static libraries.
 2022-03-05 12:40:26 +01:00
Brad King
30313aa721 while: diagnose errors during condition evaluation 
Add a policy to diagnose condition errors in a compatible way.

Fixes: #23296
 2022-03-04 13:55:12 -05:00
Brad King
7a8536e0ea Merge branch 'release-3.22' into release-3.23 2022-03-04 12:52:28 -05:00
Brad King
4dfc166976 Merge branch 'release-3.22' 2022-03-04 12:52:03 -05:00
Brad King
6e9eaf209d CMake 3.22.3 2022-03-04 12:06:35 -05:00
Brad King
41d13ade7c Merge branch 'release-3.22' into release-3.23 2022-03-04 11:54:54 -05:00
Brad King
e7c9304504 Merge branch 'release-3.21' into release-3.22 2022-03-04 11:54:30 -05:00
Brad King
76096a0ef4 Merge branch 'release-3.21' 2022-03-04 11:46:13 -05:00
Brad King
78ae759e01 CMake 3.21.6 2022-03-04 10:52:43 -05:00
Brad King
89457cb8f0 Merge topic 'file-set-name-requirements' 
b357d334fc target_sources(): Enforce stricter requirements for FILE_SET name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7037
 2022-03-04 09:09:33 -05:00
Brad King
65da32c924 Merge topic 'file-set-name-requirements' into release-3.23 
b357d334fc target_sources(): Enforce stricter requirements for FILE_SET name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7037
 2022-03-04 09:09:31 -05:00
Brad King
0d8bb14344 Merge topic 'file-set-multiple-names' 
8c23ecbd93 target_sources(): Process multiple FILE_SET arguments per block

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7040
 2022-03-04 09:07:04 -05:00
Kyle Edwards
8c23ecbd93 target_sources(): Process multiple FILE_SET arguments per block 
Fixes: #23287
 2022-03-03 14:31:54 -05:00
Kyle Edwards
b357d334fc target_sources(): Enforce stricter requirements for FILE_SET name 
Fixes: #23286
 2022-03-03 10:17:10 -05:00
Brad King
cd6341b547 Merge topic 'cuda-arch-all' 
2796d6eeca CUDA: Fix CMAKE_CUDA_ARCHITECTURES=all/all-major with NVCC 11.5+
e450d55552 Help: Update CUDA_ARCHITECTURES docs for generic all/all-major support
fe64c49e72 CUDA: Simplify CMAKE_CUDA_ARCHITECTURES special value logic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7026
 2022-03-02 07:52:18 -05:00
Brad King
04a7200c75 Merge topic 'cuda-arch-all' into release-3.23 
2796d6eeca CUDA: Fix CMAKE_CUDA_ARCHITECTURES=all/all-major with NVCC 11.5+
e450d55552 Help: Update CUDA_ARCHITECTURES docs for generic all/all-major support
fe64c49e72 CUDA: Simplify CMAKE_CUDA_ARCHITECTURES special value logic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7026
 2022-03-02 07:52:17 -05:00
Brad King
11abe00616 Merge topic 'doc-presets-v4' 
6404751176 Help: Improve wording and structure related to preset includes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7028
 2022-03-02 07:49:45 -05:00
Brad King
f0f4390325 Merge topic 'doc-presets-v4' into release-3.23 
6404751176 Help: Improve wording and structure related to preset includes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7028
 2022-03-02 07:49:44 -05:00
Brad King
1ed1edbfd1 Merge topic 'file-set-no-custom-targets' 
ad41c9cd11 target_sources(): Prohibit FILE_SET on custom targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7027
 2022-03-02 07:45:58 -05:00
Brad King
66a7d2e222 Merge topic 'file-set-no-custom-targets' into release-3.23 
ad41c9cd11 target_sources(): Prohibit FILE_SET on custom targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7027
 2022-03-02 07:45:57 -05:00
Craig Scott
6404751176 Help: Improve wording and structure related to preset includes 
Encourage placing preset includes near the beginning of a preset
file and ensure the example shows that usage. Move the prose
discussing includes to its own section to improve discoverability
and break up paragraphs to make each main point harder to miss.

Also clarify ${sourceDir} to remove any ambiguity with regard to
its meaning in included files.

Issue: #23214
 2022-03-02 11:37:57 +11:00
Brad King
d687047f99 Merge topic 'genex-LINK_GROUP' 
0a81ea1f12 Genex-LINK_GROUP: Add possibility to group libraries at link step
a9928eb4a5 SunPro C: ensure LINKER: prefix is usable for all versions
01ff75b2ff cmComputeDepends::LinkEntry: introduce enum to specify item type

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7005
 2022-03-01 08:46:09 -05:00
Brad King
1841487566 Merge topic 'doc-crosscompiling-emulator-arg-list-3.15' 
6ff1217b9c Help: Add missing versionadded to *CROSSCOMPILING_EMULATOR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7023
 2022-03-01 08:41:52 -05:00
Brad King
e450d55552 Help: Update CUDA_ARCHITECTURES docs for generic all/all-major support 
Since commit 8f64df0a7c (CUDA: Generic all and all-major support,
2021-12-19, v3.23.0-rc1~23^2), these special values do not require any
specific compiler or version.

While at it, re-organize CUDA_ARCHITECTURES special value documentation.
Move the `versionadded` markup inside each special value so we can add
more in future versions.
 2022-02-28 21:30:23 -05:00
Kyle Edwards
ad41c9cd11 target_sources(): Prohibit FILE_SET on custom targets 
Fixes: #23262
 2022-02-28 17:21:04 -05:00
friendlyanon
6ff1217b9c Help: Add missing versionadded to *CROSSCOMPILING_EMULATOR 
The list capability was added in CMake 3.15 by commit fec441ec17 (Teach
CROSSCOMPILING_EMULATOR to support arguments, 2019-05-30,
v3.15.0-rc1~6^2), but the documentation did not indicate the version
that added it.
 2022-02-28 10:40:22 -05:00
Brad King
e2cee00417 Merge topic 'clarify_ENVIRONMENT_MODIFICATION_docs' 
79f64cc773 Help: ENVIRONMENT_MODIFICATION clarify only supports singular values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !7018
 2022-02-28 10:35:18 -05:00
Marc Chevrier
0a81ea1f12 Genex-LINK_GROUP: Add possibility to group libraries at link step 
Fixes: #23121
 2022-02-28 10:26:26 +01:00
Robert Maynard
79f64cc773 Help: ENVIRONMENT_MODIFICATION clarify only supports singular values 
Lists need to be externally iterated
 2022-02-23 13:07:34 -05:00
Russell Greene
525faec4e9 CPack: Add parallel zstd compression 2022-02-23 08:39:32 -05:00
Marc Chevrier
397ee55cd6 genex-LINK_LIBRARY: rename configuration variables 
To be more consistent between genex and variables as well as
the forecomming LINK_GROUP genex, rename variable *_LINK_USING_<FEATURE>*
in *_LINK_LIBRARY_USING_<FEATURE>*
 2022-02-16 18:34:28 +01:00
Brad King
731bdec8b9 Merge topic 'vs-package-restore-docs' 
d92469e572 Help: Clarify how package resolve mode is intended to be used
f320a31087 cmake --build: prioritize --resolve-package-references over preset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6984
 2022-02-16 09:41:03 -05:00
Brad King
319584711c Merge topic 'vs-package-restore-docs' into release-3.23 
d92469e572 Help: Clarify how package resolve mode is intended to be used
f320a31087 cmake --build: prioritize --resolve-package-references over preset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6984
 2022-02-16 09:41:02 -05:00
Brad King
6e32d3a668 Merge topic 'doc-vs-instance-version' 
e163908a76 Help: Clarify version specification in CMAKE_GENERATOR_INSTANCE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6982
 2022-02-16 09:39:00 -05:00
Brad King
be87b7661c Merge topic 'doc-vs-instance-version' into release-3.23 
e163908a76 Help: Clarify version specification in CMAKE_GENERATOR_INSTANCE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6982
 2022-02-16 09:38:59 -05:00
Brad King
c46ed01fa0 Merge topic 'file-download-range' 
231872ddb0 file(DOWNLOAD): Add options to download a range

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6986
 2022-02-16 09:37:33 -05:00
Brad King
82acb05018 Merge topic 'LINK_LIBRARY-framework' 
a2cfa2da4f GenEx/LINK_LIBRARY: Add features for framework support on Apple
40178f3c90 cmGlobalGenerator: Add helper to split framework path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6967
 2022-02-16 09:36:38 -05:00
m.klimenko
231872ddb0 file(DOWNLOAD): Add options to download a range 2022-02-15 22:08:06 +03:00
Carsten Rudolph
d92469e572 Help: Clarify how package resolve mode is intended to be used 
Fixes: #23223
 2022-02-15 10:20:14 -05:00
Carsten Rudolph
f320a31087 cmake --build: prioritize --resolve-package-references over preset 
Fixes: #23224
 2022-02-15 10:20:02 -05:00
Brad King
e163908a76 Help: Clarify version specification in CMAKE_GENERATOR_INSTANCE 
Improve the documentation added by commit ec8d37b3b1 (VS: Support
version specification in CMAKE_GENERATOR_INSTANCE, 2021-10-26,
v3.23.0-rc1~452^2~1).

Fixes: #23225
 2022-02-15 10:06:12 -05:00
Brad King
c3c6408609 Merge topic 'doc-example-package-components' 
5317015e68 Help: use package-specific var for supported component list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6975
 2022-02-15 09:48:28 -05:00
Brad King
fb925e5443 Merge topic 'doc-example-package-components' into release-3.23 
5317015e68 Help: use package-specific var for supported component list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6975
 2022-02-15 09:48:27 -05:00