Commit Graph

54886 Commits

Author SHA1 Message Date
Raul Tambre
7123c8fdbf CheckLanguage: Don't pass CMAKE_CUDA_HOST_COMPILER for Visual Studio
Visual Studio doesn't support specifying it and if we do we get a warning.

Fixes: #22712
2021-10-19 09:03:24 -04:00
Brad King
9b29cfd21f Merge branch 'release-3.21' into release-3.22 2021-10-18 09:31:18 -04:00
Brad King
263f8c6119 Merge topic 'fix-ifdef-windows' into release-3.22
40e73c5ac4 Source: Fix typo in _WIN32 preprocessor checks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6631
2021-10-18 09:29:19 -04:00
Brad King
71dc6feed8 Merge branch 'release-3.20' into release-3.21 2021-10-15 12:15:15 -04:00
Brad King
e8e64e1a0c Merge branch 'release-3.19' into release-3.20 2021-10-15 12:15:05 -04:00
Brad King
8497701d22 Merge branch 'fix-ifdef-windows' into release-3.21
Merge-request: !6631
2021-10-15 12:14:50 -04:00
Brad King
ad76bedabb Merge branch 'fix-ifdef-windows' into release-3.20
Merge-request: !6631
2021-10-15 12:14:38 -04:00
Brad King
f00763c954 Merge branch 'fix-ifdef-windows' into release-3.19
Merge-request: !6631
2021-10-15 12:13:59 -04:00
Brad King
40e73c5ac4 Source: Fix typo in _WIN32 preprocessor checks
Since CMake's default compiler flags with MSVC include `-DWIN32` for
historical reasons, a few preprocessor conditions were accidentally
checking for `WIN32` instead of `_WIN32`.  The corresponding blocks
were left out when compiling official binaries for `cmake.org` because
we hard-code compiler flags without `-DWIN32`.

Fixes: #22764
2021-10-15 11:39:04 -04:00
Brad King
e16eaa723b Merge branch 'release-3.21' into release-3.22 2021-10-15 07:37:36 -04:00
Brad King
a72d105509 Merge topic 'vs2022' into release-3.22
6fde60a4c8 Help: Add 3.22 release note about the update for VS 2022 Preview 5
6dfe28f33c Merge branch 'backport-3.21-vs2022' into vs2022
a8414190da VS: Update Visual Studio 17 2022 generator for Preview 5
787ab7ff20 IRSL: Fix discovery of VS 2022 v143 toolset redistributables for preview 5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6628
2021-10-15 07:36:13 -04:00
Brad King
4d4336e3ed Merge branch 'backport-3.21-vs2022' into release-3.21
Merge-request: !6628
2021-10-14 13:50:11 -04:00
Brad King
6fde60a4c8 Help: Add 3.22 release note about the update for VS 2022 Preview 5 2021-10-14 13:45:03 -04:00
Brad King
6dfe28f33c Merge branch 'backport-3.21-vs2022' into vs2022 2021-10-14 13:40:20 -04:00
Brad King
a8414190da VS: Update Visual Studio 17 2022 generator for Preview 5 2021-10-14 13:39:45 -04:00
Brad King
787ab7ff20 IRSL: Fix discovery of VS 2022 v143 toolset redistributables for preview 5
VS 2022 Preview 5 renamed the redist directories from `Microsoft.VC142.*`
to `Microsoft.VC143.*` in order to match the `v143` toolset name.

Fixes: #22586
2021-10-14 13:37:05 -04:00
Brad King
fbc742aab0 Merge branch 'release-3.21' into release-3.22 2021-10-14 10:52:36 -04:00
Brad King
366a81b41b Merge branch 'zstd-armv6' into release-3.22
Merge-request: !6625
2021-10-14 10:52:05 -04:00
Brad King
69f3fa9816 Merge branch 'release-3.20' into release-3.21 2021-10-14 10:51:56 -04:00
Brad King
cd44a5b419 Merge branch 'zstd-armv6' into release-3.21
Merge-request: !6625
2021-10-14 10:51:43 -04:00
Brad King
6a8531a60a Merge branch 'zstd-armv6' into release-3.20
Merge-request: !6625
2021-10-14 10:51:05 -04:00
Brad King
e4e4c59180 zstd: Backport fix for SIGBUS on armv6 from zstd 1.5.0
Backport zstd commit `28d0120b` (Avoid SIGBUS on armv6, 2021-05-11,
`v1.5.0^2~11^2`) to our bundled copy of zstd 1.4.5.

Fixes: #22754
2021-10-14 10:35:52 -04:00
Brad King
167060303b CMake 3.22.0-rc1 v3.22.0-rc1 2021-10-14 08:03:54 -04:00
Brad King
9b8a551d84 Merge topic 'update-zstd' into release-3.22
ddced0c6b6 zstd: Fix trace compilation on AIX
ee98d9378f zstd: Fix ZSTD_VecMask_next compilation of software ctz implementation
eb8db99596 Merge branch 'upstream-zstd' into update-zstd
da1e841ccf zstd 2021-05-14 (a488ba11)
8c65ea4744 zstd: Update script to get zstd 1.5.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6622
2021-10-14 07:46:01 -04:00
Brad King
127cb6481c Merge topic 'doc_clarify_list_pop' into release-3.22
67f8d20a8e Help: clarify list(POP_* <in_out> <in_out>) behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6620
2021-10-14 07:44:43 -04:00
Brad King
c5a24cd52b Merge topic 'doc-frontend-variant' into release-3.22
f2262fab51 Help: Add documentation for CMAKE_<LANG>_COMPILER_FRONTEND_VARIANT
ffb54e2350 Help: Add more documentation for CMAKE_<LANG>_SIMULATE_ID

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6621
2021-10-14 07:43:38 -04:00
Brad King
ddced0c6b6 zstd: Fix trace compilation on AIX
Since zstd commit `6cee3c2c` ([trace] Remove default definitions of weak
symbols, 2021-04-26, v1.5.0^2~53^2), the weak symbol trace
implementation does not compile on AIX.  Disable it.
2021-10-14 05:53:29 -04:00
Brad King
ee98d9378f zstd: Fix ZSTD_VecMask_next compilation of software ctz implementation 2021-10-14 05:09:11 -04:00
Robert Maynard
67f8d20a8e Help: clarify list(POP_* <in_out> <in_out>) behavior 2021-10-14 08:53:17 +11:00
Deniz Bahadir
f2262fab51 Help: Add documentation for CMAKE_<LANG>_COMPILER_FRONTEND_VARIANT
Signed-off-by: Deniz Bahadir <deniz@code.bahadir.email>
2021-10-13 10:37:09 -04:00
Deniz Bahadir
ffb54e2350 Help: Add more documentation for CMAKE_<LANG>_SIMULATE_ID
Signed-off-by: Deniz Bahadir <deniz@code.bahadir.email>
2021-10-13 10:37:08 -04:00
Brad King
eb8db99596 Merge branch 'upstream-zstd' into update-zstd
# By zstd upstream
* upstream-zstd:
  zstd 2021-05-14 (a488ba11)
2021-10-13 10:04:27 -04:00
zstd upstream
da1e841ccf zstd 2021-05-14 (a488ba11)
Code extracted from:

    https://github.com/facebook/zstd.git

at commit a488ba114ec17ea1054b9057c26a046fc122b3b6 (v1.5.0).
2021-10-13 10:04:26 -04:00
Brad King
8c65ea4744 zstd: Update script to get zstd 1.5.0 2021-10-13 10:04:17 -04:00
Brad King
6bfe5f24da Merge topic 'optimize-macos-runtime-dependencies' into release-3.22
93c5864aa1 cmBinUtilsMacOSMachOLinker: improve performance by memoizing otool calls
fc92d6640b cmFileCommand: improve error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6616
2021-10-13 08:57:51 -04:00
Seth R Johnson
93c5864aa1 cmBinUtilsMacOSMachOLinker: improve performance by memoizing otool calls
Libraries with many repeated transitive dependencies (e.g. Trilinos)
can result in very long runtime dependency call times, especially if
system calls are made more expensive by antivirus software. This
change caches the results of the calls to otool for efficiency.
2021-10-12 11:40:46 -04:00
Seth R Johnson
fc92d6640b cmFileCommand: improve error message
Print full list of unresolved dependencies and a phrase that indicates
what about the file is unresolved.
2021-10-12 11:40:45 -04:00
Brad King
7257539e67 Merge branch 'release-3.21' into release-3.22 2021-10-12 09:36:20 -04:00
Brad King
f07bedbedd Merge branch 'release-3.20' into release-3.21 2021-10-12 09:36:09 -04:00
Brad King
568a93d08c Merge branch 'msvc-c++23' into release-3.21
Merge-request: !6614
2021-10-12 09:35:56 -04:00
Brad King
e19016c436 Merge branch 'msvc-c++23' into release-3.20
Merge-request: !6614
2021-10-12 09:35:32 -04:00
Brad King
323846afc1 Merge topic 'msvc-c++23' into release-3.22
ef47e18ad0 MSVC: Tolerate cxx_std_23 feature on older compiler versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6614
2021-10-12 09:34:16 -04:00
Brad King
975b935129 Begin 3.22 release versioning 2021-10-08 10:05:02 -04:00
Brad King
e137ce0a52 gitlab-ci: Drop package pipeline upload jobs for release branch
The package pipeline for release versions should not upload packages
automatically to our archive of nightly development versions.
2021-10-08 10:01:41 -04:00
Brad King
e5a97f83b3 Help: Drop development topic notes to prepare release
Release versions do not have the development topic section of
the CMake Release Notes index page.
2021-10-08 10:00:22 -04:00
Brad King
8c27ccd945 Merge topic 'doc-3.22-relnotes'
9f0b52b8e6 Help: Update Sphinx versionadded directives for 3.22 release
c632a7105c Help: Organize and revise 3.22 release notes
48e503ec78 Help: Consolidate 3.22 release notes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6606
2021-10-08 09:58:19 -04:00
Brad King
daab8b891c Merge topic 'tutorial_update_step_4'
5a86ce5428 Tutorial: Step 4 improvements

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6564
2021-10-08 09:50:04 -04:00
Brad King
9fdfc5dd44 Merge topic 'find-blas-lapack-cleanup'
635f2c87f5 FindBLAS: Fix EML and ArmPL indentations
816dc1cb19 FindBLAS: Replace set(A val) with string(APPEND)
a7843faa20 FindLAPACK: Replace set(A val) with string(APPEND)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6605
2021-10-08 09:49:21 -04:00
Brad King
b1d27da3ec Merge branch 'release-3.21' 2021-10-08 09:47:47 -04:00
Brad King
2fd749fd4b Merge branch 'release-3.20' 2021-10-08 09:47:45 -04:00