mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 04:40:56 -06:00
Code Issues Packages Projects Releases Wiki Activity
55,233 Commits 2 Branches 385 Tags
cf7e68087d005051ec07cb21c2aed2963a3d5c4e
Commit Graph

55233 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Kitware Robot
df2ffa30a7 CMake Nightly Date Stamp 2021-11-07 00:02:07 -04:00
Kitware Robot
30c0bc8cd7 CMake Nightly Date Stamp 2021-11-06 00:02:08 -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
Brad King
95f44e00cd Ninja Multi-Config: Fix custom command target dependencies in cross-configs 
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
 2021-11-04 13:41:16 -04:00
Brad King
a883363935 Ninja Multi-Config: Fix internal cross-config target dependency ordering 
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
 2021-11-04 13:41:13 -04:00
Brad King
16e24748c5 Ninja Multi-Config: Fix cross-config custom command dependency tracing 
Process `CMAKE_CROSS_CONFIGS` and friends to properly configure the
generator for cross-config behavior before custom command dependency
tracing.
 2021-11-04 12:23:35 -04:00
Brad King
8da45b1b08 Merge branch 'release-3.22' 2021-11-04 12:22:40 -04:00
Brad King
fda948846b Merge branch 'release-3.21' into release-3.22 2021-11-04 12:22:34 -04:00
Brad King
6cfb411b75 Merge branch 'release-3.21' 2021-11-04 12:22:29 -04:00
Rose
b86b6aaa4a Source: Cleanup and simplify some code 2021-11-04 09:20:48 -04:00
Brad King
b8f2ecb636 Merge branch 'release-3.22' 2021-11-04 09:07:48 -04:00
Brad King
fc3f20a40f Merge topic 'doc-TARGET_RUNTIME_DLLS' 
001870d451 Help: Clarify TARGET_RUNTIME_DLLS behavior on imported targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !6700
 2021-11-04 09:07:48 -04:00
Brad King
85771bbf00 Merge topic 'doc-TARGET_RUNTIME_DLLS' into release-3.22 
001870d451 Help: Clarify TARGET_RUNTIME_DLLS behavior on imported targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !6700
 2021-11-04 09:07:47 -04:00
Brad King
391f0d5f6d Merge branch 'release-3.22' 2021-11-04 09:06:40 -04:00
Brad King
e0bb15abfd Merge topic 'FindHDF5-avoid-duplicate-library-entries' 
247f1149e1 FindHDF5: clear language-specific libraries list before discovery
f56963cf05 FindHDF5: clear library output variables at the top of the module

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6698
 2021-11-04 09:06:40 -04:00
Brad King
753d861a3b Merge topic 'FindHDF5-avoid-duplicate-library-entries' into release-3.22 
247f1149e1 FindHDF5: clear language-specific libraries list before discovery
f56963cf05 FindHDF5: clear library output variables at the top of the module

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6698
 2021-11-04 09:06:39 -04:00
Brad King
e602d177c6 Merge branch 'release-3.22' 2021-11-04 09:05:40 -04:00
Brad King
10bebbf7a8 Merge topic 'msvc-cxx-modules-scanDependencies' 
9ed1d7bee6 cmScanDepFormat: Accept P1689r4 files with version 1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6696
 2021-11-04 09:05:40 -04:00
Brad King
6f995f3825 Merge topic 'msvc-cxx-modules-scanDependencies' into release-3.22 
9ed1d7bee6 cmScanDepFormat: Accept P1689r4 files with version 1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6696
 2021-11-04 09:05:39 -04:00
Brad King
e83f9c5316 Merge branch 'release-3.22' 2021-11-04 09:04:42 -04:00
Brad King
52e1ff3315 Merge topic 'FindHDF5-fix-windows-hl-implib-query' 
6f830c5c38 FindHDF5: fix variable name when querying `hdf5_hl`'s implib

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6697
 2021-11-04 09:04:42 -04:00
Brad King
274e3fb7f4 Merge topic 'FindHDF5-fix-windows-hl-implib-query' into release-3.22 
6f830c5c38 FindHDF5: fix variable name when querying `hdf5_hl`'s implib

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6697
 2021-11-04 09:04:41 -04:00
Brad King
1fbbaaf853 Merge branch 'release-3.22' 2021-11-04 09:03:23 -04:00
Brad King
7456127e01 Merge topic 'GNUtoMS-vs2022' into release-3.22 
571a795d2f GNUtoMS: Add search path for VS 2022 environment scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6695
 2021-11-04 09:03:22 -04:00
Brad King
bbc9a27e5f Merge topic 'GNUtoMS-vs2022' 
571a795d2f GNUtoMS: Add search path for VS 2022 environment scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6695
 2021-11-04 09:03:22 -04:00
Brad King
338c12152a Merge branch 'release-3.22' 2021-11-04 09:02:02 -04:00
Brad King
30be83c8a2 Merge topic 'ninja-pdb-dir' 
73b84db62d Ninja: Fix creation of Windows import library directory
bd36735f65 cmNinjaTargetGenerator: Replace "their" with "there" in comment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6694
 2021-11-04 09:02:02 -04:00
Brad King
b15ac6416c Merge topic 'ninja-pdb-dir' into release-3.22 
73b84db62d Ninja: Fix creation of Windows import library directory
bd36735f65 cmNinjaTargetGenerator: Replace "their" with "there" in comment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6694
 2021-11-04 09:02:01 -04:00
Arcturus Arcturus
9fac18a4a6 Help: Clarify target_sources path conversion w.r.t generator expressions 
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>
 2021-11-04 20:24:19 +11:00
Kitware Robot
909f435b93 CMake Nightly Date Stamp 2021-11-04 00:01:07 -04:00
Brad King
d18ba5b226 Merge branch 'doc-TARGET_RUNTIME_DLLS' into release-3.21 
Merge-request: !6700
 2021-11-03 16:18:29 -04:00
Brad King
001870d451 Help: Clarify TARGET_RUNTIME_DLLS behavior on imported targets 
This generator expression does not report the locations of `.dll`
files on imported targets with the `UNKNWON` type, since their
`IMPORTED_LOCATION` refers to the import library and not the DLL.

Fixes: #22845
 2021-11-03 16:17:17 -04:00
Ben Boeckel
247f1149e1 FindHDF5: clear language-specific libraries list before discovery 2021-11-03 13:24:30 -04:00
Ben Boeckel
f56963cf05 FindHDF5: clear library output variables at the top of the module 
This avoids accumulation of `HDF5_LIBRARIES` results when calling
`find_package(HDF5)` multiple times within a single scope.
 2021-11-03 13:05:18 -04:00
Ben Boeckel
6f830c5c38 FindHDF5: fix variable name when querying hdf5_hl's implib 
Introduced in 4150048a3b (FindHDF5: unset some variables, 2017-07-24).
 2021-11-03 11:29:20 -04:00
Brad King
6202af6092 Merge branch 'msvc-cxx-modules-scanDependencies' into release-3.21 
Merge-request: !6696
 2021-11-03 10:51:37 -04:00
Brad King
9ed1d7bee6 cmScanDepFormat: Accept P1689r4 files with version 1 
VS 2022's `cl` 19.30 has a `-scanDependencies` option that produces the
P1689r4 format.  It reports the "version" field with value "1".
 2021-11-03 10:50:54 -04:00
Brad King
6251239a1c Merge topic 'C++-headers' 
6f4727aaa0 Source: Replace C headers with C++ ones

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6657
 2021-11-03 10:41:11 -04:00
Brad King
d2a6df9f7c Merge topic 'no-opt-crash' 
7c90d00af9 Tests: Prevent compiler optimizing away test code in CTestTestCrash

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6688
 2021-11-03 10:40:03 -04:00