mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-26 08:08:24 -05:00
Code Issues Packages Projects Releases Wiki Activity
53,888 Commits 2 Branches 401 Tags
69355ff00c5a773f26c65caafbc9e77e76c824ff
Commit Graph

53888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Brad King 2104c198bd Merge topic 'corret_nvhpc_fortran_compile_deps' into release-3.21 
1a828043b7 NVHPC: only use '-MD' for the C and CXX languages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6602
 2021-10-07 09:11:20 -04:00
Robert Maynard 1a828043b7 NVHPC: only use '-MD' for the C and CXX languages 
CMake shouldn't use '-MD' for nvfortran to generate dependency information.

Fixes #22723
 2021-10-06 16:21:29 -04:00
Brad King b82e7ed5eb Merge topic 'bootstrap-qt6' into release-3.21 
6458a32242 bootstrap: Enable cmake_language command to support cmake-gui with Qt 6.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Andrew Maclean <andrew.amaclean@gmail.com>
Merge-request: !6593
 2021-10-06 10:28:59 -04:00
Brad King cd51eba584 Merge topic 'cpack-qtifw-4.1' into release-3.21 
5895f236ae CPack/IFW: Add support for QtIFW 4.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Konstantin Podsvirov <konstantin@podsvirov.pro>
Merge-request: !6592
 2021-10-06 10:26:35 -04:00
Brad King 1e3cc4b2b1 Merge topic 'ci-xcode-13.0' into release-3.21 
429522e89c gitlab-ci: update macOS jobs to use Xcode 13.0
75901f0472 Tests: Fix RunCMake.XcodeProject XcodeIOSInstallCombined cases for Xcode 13.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6578
 2021-10-06 10:25:30 -04:00
Brad King 5eef6ca26d Merge topic 'xcode13-schema' into release-3.21 
0e86fea0be Tests: Specify destination for Xcode scheme

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6582
 2021-10-06 10:24:15 -04:00
Brad King 15f405cdf1 Merge topic 'ci-ctest-update' into release-3.21 
3b581ab3aa ci: Enable CTest.Update{CVS,SVN,HG} tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6596
 2021-10-06 10:22:21 -04:00
Brad King 3b581ab3aa ci: Enable CTest.Update{CVS,SVN,HG} tests 
Enable all three in Debian builds.  Leave out CVS in Fedora builds
because the cvs package was not built with `--enable-rootcommit`.
 2021-10-05 11:06:42 -04:00
Brad King 6458a32242 bootstrap: Enable cmake_language command to support cmake-gui with Qt 6.2 
Fixes: #22721
 2021-10-05 09:48:46 -04:00
Erlend E. Aasland 5895f236ae CPack/IFW: Add support for QtIFW 4.1 
Fixes: #22722
 2021-10-05 09:18:52 -04:00
Brad King 429522e89c gitlab-ci: update macOS jobs to use Xcode 13.0 2021-10-05 09:13:23 -04:00
Brad King 75901f0472 Tests: Fix RunCMake.XcodeProject XcodeIOSInstallCombined cases for Xcode 13.0 
The output of `otool -vf` now contains additional content that happens
to be matched by our architectures regex.  Make the regex more strict.
 2021-10-05 09:13:23 -04:00
Brad King 7518fc0c31 Merge topic 'testdriver-old-cast-warning' into release-3.21 
ba54092842 TestDriver: Fix old-style-cast warning in C++ mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6590
 2021-10-05 09:01:59 -04:00
Gregor Jasny 0e86fea0be Tests: Specify destination for Xcode scheme 
The `Using the first of multiple matching destinations` warning
vanishes if we explicitly specify a destination.

Fixes: #22704
 2021-10-05 07:38:48 -04:00
Sylvain Joubert ba54092842 TestDriver: Fix old-style-cast warning in C++ mode 
A C-style cast was added by commit 3f6ff4b5db (create_test_sourcelist:
add test driver option to run all tests, 2021-04-27, v3.21.0-rc1~257^2).
Use our `CM_CAST` macro to adapt based on the language.
 2021-10-04 11:00:12 -04:00
Brad King d1a7e78c4f Merge topic 'FortranCInterface-timestamp-check' into release-3.21 
2a00e5072d FortranCInterface: Fix regression in timestamp check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !6581
 2021-10-04 10:36:51 -04:00
Seth R Johnson 2a00e5072d FortranCInterface: Fix regression in timestamp check 
Since commit d7c8030541 (FortranCInterface: Fix misuse of IS_NEWER_THAN
in timestamp check, 2021-02-21, v3.21.0-rc1~631^2~3), FortranCInterface
checks for `Output.cmake.in` in the build tree instead of the source
tree as before.  This caused it to always re-run the detection.

Fixes: #22709
 2021-10-01 13:00:18 -04:00
Brad King 12b999e66a Merge topic 'autogen-dep-on-imported-implib-only-target' into release-3.21 
895fa3433f cmQtAutoGenInitializer: support IMPLIB-only imported targets
354c1f5628 Tests/RunCMake/Autogen: test CMP0111 behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6558
 2021-09-27 13:48:56 -04:00
Ben Boeckel 895fa3433f cmQtAutoGenInitializer: support IMPLIB-only imported targets 
Instead of using the target name directly (which ends up in the `Ninja`
generators querying for the `LOCATION` parameter), wrap up the target
name in a `$<TARGET_LINKER_FILE:>` to avoid the query for the unset
property.
 2021-09-24 11:29:54 -04:00
Ben Boeckel 354c1f5628 Tests/RunCMake/Autogen: test CMP0111 behavior 
On Windows, imported shared libraries which only have an
`IMPORTED_IMPLIB` set fail if they are depended upon by a target using
automoc. Add a test for the behavior of depending upon all imported
target types from an automoc-using target.
 2021-09-24 11:29:54 -04:00
Brad King afd4d25280 Merge topic 'FindMatlab-r2021b' into release-3.21 
a013404f43 FindMatlab: Add R2021b => 9.11 version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6556
 2021-09-24 09:14:19 -04:00
Michael Hirsch a013404f43 FindMatlab: Add R2021b => 9.11 version 
R2021b released 09/22/2021.
 2021-09-23 10:41:20 -04:00
Brad King 7612abd52f CMake 3.21.3 v3.21.3 2021-09-20 12:43:52 -04:00