mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-28 09:58:53 -06:00
Code Issues Packages Projects Releases Wiki Activity
55,213 Commits 2 Branches 390 Tags
8da45b1b08d8936070e806b711d589b47f2a7e1f
Commit Graph

55213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Brad King
4743b43126 Merge branch 'release-3.22' 2021-11-03 10:39:05 -04:00
Brad King
36afda49e6 Merge topic 'help_cmake_lang_extensions_default' 
e9976c8827 Help: Better explain CMAKE_<LANG>_EXTENSIONS_DEFAULT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6686
 2021-11-03 10:39:05 -04:00
Brad King
f06f74ede7 Merge topic 'help_cmake_lang_extensions_default' into release-3.22 
e9976c8827 Help: Better explain CMAKE_<LANG>_EXTENSIONS_DEFAULT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6686
 2021-11-03 10:39:04 -04:00
Brad King
2f9b36eef0 Merge branch 'release-3.22' 2021-11-03 10:37:55 -04:00
Brad King
98f0ee645f Merge topic 'nvhpc-isystem' 
92624714c4 NVHPC: Support SYSTEM include directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6691
 2021-11-03 10:37:55 -04:00
Brad King
28d63320f1 Merge topic 'nvhpc-isystem' into release-3.22 
92624714c4 NVHPC: Support SYSTEM include directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6691
 2021-11-03 10:37:54 -04:00
Brad King
ac5932c9e4 Merge branch 'GNUtoMS-vs2022' into release-3.21 
Merge-request: !6695
 2021-11-03 10:34:05 -04:00
Brad King
571a795d2f GNUtoMS: Add search path for VS 2022 environment scripts 
Extend the logic from commit 08c5b3eff0 (GNUtoMS: Add search path for VS
2019 environment scripts, 2020-01-09, v3.16.3~15^2) to consider VS 2022
paths too.

Fixes: #22847
 2021-11-03 10:32:14 -04:00
Brad King
73b84db62d Ninja: Fix creation of Windows import library directory 
Call `EnsureParentDirectoryExists` with our internal representation
of the path, not the representation quoted/encoded for Ninja.

Fixes: #22841
 2021-11-03 10:08:48 -04:00
Brad King
bd36735f65 cmNinjaTargetGenerator: Replace "their" with "there" in comment 2021-11-03 10:08:47 -04:00
Kitware Robot
47846c5063 CMake Nightly Date Stamp 2021-11-03 00:02:13 -04:00
Rose
6f4727aaa0 Source: Replace C headers with C++ ones 
In applicable areas only, of course.
 2021-11-02 14:45:29 -04:00
Robert Maynard
92624714c4 NVHPC: Support SYSTEM include directories 
Fixed #22834
 2021-11-02 14:33:18 -04:00
Raul Tambre
e9976c8827 Help: Better explain CMAKE_<LANG>_EXTENSIONS_DEFAULT 
Explain that this represents the compiler's default and mustn't be modified
by the user. Clarify when it's used as the default.

Additionally:
* Add a reference to it in cmake-compile-features in text explaining the
  feature.
* Add explanations for the default initialization by
  `CMAKE_<LANG>_EXTENSIONS_DEFAULT` to all `<LANG>_EXTENSIONS` pages and
  references to CMP0128.
* Slightly reduce the wordiness of the default initialization explanations by
  removing an unnecessary "it is".

Fixes #22828.
 2021-11-02 17:58:21 +02:00
William R. Dieter
7c90d00af9 Tests: Prevent compiler optimizing away test code in CTestTestCrash 
The CTestTestCrash tries to force a crash by dereferencing a NULL
pointer.  The oneAPI 2021.4 C compiler notices that the pointer and the
value fetched from the pointer are never used and optimizes away the
dereferencing of the NULL pointer, which prevents the crash, causing
the test to fail.

This change adds the `volatile` keyword the pointer to prevent the
compiler optimizing it away.  Removing a reference to a `volatile`
variable is illegal because access to a `volatile` variable could have
side effects not observable by the compiler.

Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
 2021-11-02 09:03:27 -04:00
Brad King
4e84a4763d Merge topic 'support_nvcc_native_flag' 
14d8a2768d CUDA: Support nvcc 11.5 new -arch=all|all-major flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6652
 2021-11-02 08:55:13 -04:00
Brad King
d273175157 Merge topic 'ci-msvc-v71' 
11903f1b5f ci: Add MSVC v71 NMake nightly CI job

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6687
 2021-11-02 08:52:55 -04:00
Brad King
3b1f23b789 Merge topic 'update-kwsys' 
37c2f722fc find_program: Explicitly skip WindowsApps/python*.exe app installer links
d8b5b0c7e4 Merge branch 'upstream-KWSys' into update-kwsys
e9ab6eeeb5 KWSys 2021-11-01 (572f2a65)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6679
 2021-11-02 08:51:34 -04:00
Brad King
6abcae4d52 Merge branch 'release-3.22' 2021-11-02 08:50:02 -04:00