mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-27 00:49:52 -06:00
Code Issues Packages Projects Releases Wiki Activity
55,293 Commits 2 Branches 387 Tags
75ab2edf8ac8ea2258963d02f95317181d162c19
Commit Graph

55293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kitware Robot
75ab2edf8a CMake Nightly Date Stamp 2021-11-12 00:01:10 -05:00
Brad King
2f37c48cf1 Merge topic 'xcode-embed-plugins' 
9e1e7dc7db Xcode: Add embedded plugins option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6690
 2021-11-11 10:51:48 -05:00
Brad King
1a0cd53994 Merge topic 'FindVulkan-pre-1.2.175' 
db8bd5965f FindVulkan: Fix finding versions < 1.2.175

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6717
 2021-11-11 10:48:26 -05:00
Brad King
79354bf7a4 Merge topic 'FindThreads-libc-pthread-flag' 
68285bc8a9 FindThreads: Honor THREADS_PREFER_PTHREAD_FLAG when pthread is found in libc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6693
 2021-11-11 10:47:33 -05:00
Brad King
06c6799e6f Merge branch 'release-3.22' 2021-11-11 10:46:19 -05:00
Brad King
13f67406b5 Merge branch 'release-3.21' 2021-11-11 10:46:17 -05:00
Brad King
2ad300ebd7 Merge branch 'release-3.21' into release-3.22 2021-11-11 10:46:12 -05:00
Brad King
0745508b8d Merge branch 'release-3.22' 2021-11-11 10:45:20 -05:00
Brad King
0712314f8e Merge topic 'IntelLLVM-no-xilink' 
48f29b5805 IntelLLVM: Use MSVC linker with MSVC frontend variant

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6719
 2021-11-11 10:45:20 -05:00
Brad King
e2ceaec991 Merge topic 'IntelLLVM-no-xilink' into release-3.22 
48f29b5805 IntelLLVM: Use MSVC linker with MSVC frontend variant

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6719
 2021-11-11 10:45:19 -05:00
Kitware Robot
7cb5f96952 CMake Nightly Date Stamp 2021-11-11 00:01:07 -05:00
Brad King
b0ee34373a Merge branch 'IntelLLVM-no-xilink' into release-3.21 
Merge-request: !6719
 2021-11-10 13:43:41 -05:00
William R. Dieter
48f29b5805 IntelLLVM: Use MSVC linker with MSVC frontend variant 
The Intel compiler (pre-LLVM) expected xilink.exe and had special logic to
set xilink.exe.  The newer LLVM-based compiler does not want xilink.exe.
link.exe works better for host code, and is the default, so change
the matching condition such that the old compiler matches (and gets
xilink.exe) and the new compiler gets the default link.exe it expects.

A better solution will be to use the compiler as the linker.  A future
change will switch to compiler as linker by default, but that fix needs
more validation.

Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
 2021-11-10 13:41:06 -05:00
Ralf Habacker
db8bd5965f FindVulkan: Fix finding versions < 1.2.175 2021-11-10 16:11:46 +01:00
Gusts Kaksis
9e1e7dc7db Xcode: Add embedded plugins option 2021-11-10 09:57:07 -05:00
Brad King
19b51730b7 Merge topic 'quote-hyphen-in-rsp' 
144e8dcf40 cmOutputConverter: Quote hyphens in response files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6714
 2021-11-10 09:15:38 -05:00
Mattias Ellert
68285bc8a9 FindThreads: Honor THREADS_PREFER_PTHREAD_FLAG when pthread is found in libc 
The `-pthread` flag tells the compiler/linker to link to additional
libraries needed for thread support (e.g. libatomic on riscv64). The
flag therefore should be used if requested using
`THREADS_PREFER_PTHREAD_FLAG` also when the pthread functions are
found in libc.
 2021-11-10 14:29:09 +01:00
Craig Scott
54682983cb Merge branch 'release-3.22' 2021-11-10 05:47:34 -05:00
Craig Scott
5b96ff825e Merge topic 'doc-CMP0128' 
8371056fbb Help: Correct inaccuracies in wording for CMP0128

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6711
 2021-11-10 05:47:34 -05:00
Craig Scott
0b8d692697 Merge topic 'doc-CMP0128' into release-3.22 
8371056fbb Help: Correct inaccuracies in wording for CMP0128

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6711
 2021-11-10 05:47:33 -05:00
Kitware Robot
4b5fa96e80 CMake Nightly Date Stamp 2021-11-10 00:01:09 -05:00
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
Craig Scott
8371056fbb Help: Correct inaccuracies in wording for CMP0128 2021-11-09 07:37:09 +11: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
Brendan O'Rourke
144e8dcf40 cmOutputConverter: Quote hyphens in response files 
Fixes: #20070
 2021-11-08 12:14:53 -06: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