Commit Graph

53911 Commits

Author SHA1 Message Date
Brad King
b54d61c4a0 Merge branch 'ci-xcode-13.1' into release-3.21
Merge-request: !6757
2021-11-22 19:40:47 -05:00
Brad King
224d81e804 gitlab-ci: update macOS jobs to use Xcode 13.1 2021-11-22 18:04:43 -05:00
Brad King
bad7959397 Merge branch 'UseSWIG-create-workingdir' into release-3.21
Merge-request: !6750
2021-11-19 12:12:07 -05:00
Marc Chevrier
7224eb5185 UseSWIG: ensure directory for depfile exists
When `Visual Studio` and `Xcode` generators are used, directory for depfile
is not implicitely created by CMake when OUTFILE_DIR option is used.

Fixes: #22932
2021-11-19 17:50:52 +01:00
Brad King
c468f983c0 Merge branch 'release-3.20' into release-3.21 2021-11-18 09:00:15 -05:00
Brad King
80b6b201a6 Merge branch 'IntelLLVM-Fortran-copy-mod' into release-3.21
Merge-request: !6740
2021-11-17 10:42:51 -05:00
Brad King
7cc7f9aa26 Merge branch 'IntelLLVM-Fortran-copy-mod' into release-3.20
Merge-request: !6740
2021-11-17 10:42:37 -05:00
Brad King
209b896f2c IntelLLVM: Enable Fortran module rebuild avoidance in Makefile generators
The Makefile generators use an internal `cmake -E cmake_copy_f90_mod`
tool to avoid rebuilding module consumers when the `.mod` content
changes only in a trivial way (e.g. the time it was built).  This is
done with logic specific to each vendor's module file format.  Enable
the "Intel" format support when using the IntelLLVM compiler (ifx) too.

Issue: #22922
2021-11-17 10:41:30 -05:00
Brad King
bb48c75817 Merge branch 'release-3.20' into release-3.21 2021-11-12 08:59:43 -05:00
Brad King
521c49eebc Merge branch 'IntelLLVM-Fortran-frontend-variant' into release-3.21
Merge-request: !6718
2021-11-11 11:24:01 -05:00
Brad King
09ef62fd98 Merge branch 'IntelLLVM-Fortran-frontend-variant' into release-3.20
Merge-request: !6718
2021-11-11 11:23:35 -05:00
William R. Dieter
b1edd6e7c7 Fortran: Save frontend variant persistently for IntelLLVM
Since commit a90d2a9eed (IntelLLVM: Add support for Intel LLVM-based
compilers, 2020-11-02, v3.20.0-rc1~89^2~20), our IntelLLVM compiler
support populates `CMAKE_Fortran_COMPILER_FRONTEND_VARIANT`.  However,
the frontend variant was not stored in `CMakeCompilerFortran.cmake`.

Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
2021-11-11 11:22: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
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
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
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
f65cebf51a CMake 3.21.4 v3.21.4 2021-10-27 09:51:39 -04:00
Brad King
9d44ea4cde Merge branch 'backport-3.21-vs2022' into release-3.21
Merge-request: !6664
2021-10-27 09:00:58 -04:00
Brad King
f3ddc52676 VS: Update Visual Studio 17 2022 generator for the Release Candidates
Assume this is close enough to the final release to treat as
non-experimental support.
2021-10-27 08:49:47 -04:00
Brad King
69355ff00c Merge branch 'binutils-llvm-strip' into release-3.21
Merge-request: !6655
2021-10-22 09:25:24 -04:00
Brad King
5dd981539f BinUtils: Avoid llvm-strip versions older than Clang 11
Since commit cf82300a63 (BinUtils: Clarify search logic and make it more
consistent, 2021-05-27, v3.21.0-rc1~119^2~2) we correctly prefer the
more-specific name `llvm-strip` over `strip` when using Clang.  However,
`llvm-strip` from Clang versions prior to 11 require extra flags to
strip everything.  Until our `install(TARGETS)` logic learns to add
those flags, avoid using older versions of `llvm-strip` by default.

Fixes: #22785
2021-10-22 09:24:46 -04:00
Brad King
69c6994023 Merge branch 'backport-3.21-vs2022' into release-3.21
Merge-request: !6640
2021-10-19 09:35:50 -04:00
Brad King
3d9d75b0be VS: Update Visual Studio 17 2022 generator for the Release Candidate 2021-10-19 09:27:37 -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
4d4336e3ed Merge branch 'backport-3.21-vs2022' into release-3.21
Merge-request: !6628
2021-10-14 13:50:11 -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
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
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
f6ec46a543 Merge branch 'release-3.20' into release-3.21 2021-10-08 09:47:33 -04:00
Brad King
de99806587 Merge branch 'release-3.19' into release-3.20 2021-10-08 09:46:51 -04:00
Brad King
ac910db867 Merge branch 'revert-debian-libexec' into release-3.20
Merge-request: !6607
2021-10-08 09:46:39 -04:00
Brad King
c352d16aaf Merge branch 'revert-debian-libexec' into release-3.19
Merge-request: !6607
2021-10-08 09:46:09 -04:00
Brad King
1a47305edf Merge topic 'revert-debian-libexec' into release-3.21
6658e260d4 GNUInstallDirs: Fix misinterpretation of Debian Policy on LIBEXECDIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6607
2021-10-08 09:45:10 -04:00
Timo Röhling
6658e260d4 GNUInstallDirs: Fix misinterpretation of Debian Policy on LIBEXECDIR
Revert commit 798c1c3192 (GNUInstallDirs: Comply with Debian Policy on
LIBEXECDIR, 2020-10-08, v3.19.0-rc1~11^2).

The Debian Policy builds upon FHS 3.0 and permits installing to
`/usr/libexec`. While Policy does grant an additional exception for
applications to use a single subdirectory of `/usr/lib/<triplet>`, this
is not meant to replace `/usr/libexec` as valid target.

Fixes: #22731
2021-10-07 14:29:18 -04:00
Brad King
ef47e18ad0 MSVC: Tolerate cxx_std_23 feature on older compiler versions
In commit 3aaf1d91bf (MSVC: C++20 final flag, C++23 support, 2021-05-29,
v3.20.4~7^2~1) we forgot to add `cxx_std_23` to the fallback table for
MSVC versions from VS 2010 through VS 2015.  This allows project to at
least attempt compilation with these compilers since they do not have
any modes.

Issue: #22729
2021-10-07 11:46:09 -04:00