Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-14 02:08:27 +08:00
Code Issues Projects Releases Wiki Activity
52,236 Commits 2 Branches 375 Tags
efa5e1f367ac76cb7aa919929ece1f4799cdc4b2
Commit Graph

52236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
efa5e1f367 CMake 3.20.5 v3.20.5 2021-06-21 11:23:19 -04:00
Brad King
25e82666e4 Help: Add 3.20 release note section for 3.20.{3,4,5} 
Make it clear that the notes for these patch releases were not
forgotten, and that there were simply no changes to documented features
or interfaces.
 2021-06-21 11:20:33 -04:00
Brad King
621f7bf2e5 Merge branch 'test-xcode-13' into release-3.20 
Merge-request: !6248
 2021-06-21 09:56:09 -04:00
Brad King
d6c0cc1681 Merge branch 'ep-git-update-commit-ref' into release-3.20 
Merge-request: !6249
 2021-06-21 09:47:43 -04:00
Craig Scott
360ff17dc6 ExternalProject: Use ${ref}^0 to avoid MSYS/Cygwin shell substitutions 
In 5e941a545b (ExternalProject: Ensure git fetch if updating to hash we
don't have yet, 2021-05-09), the form ${ref}^{commit} was used to ensure
the ref was treated as a commit. When running under a MSYS2 or
Cygwin shell, the {commit} part can be translated by the shell, leaving it as
${ref}^commit, which git doesn't understand. Use the equivalent but
safer form ${ref}^0, since it won't be subject to the shell substitution
issue.

Fixes: #22299
 2021-06-20 15:40:45 +10:00
Brad King
1dd0eae4fc Tests: Fix xcode version detection for Xcode 13 on ARM 
Running `xcode -version` on an ARM box prints content to stderr:

    objc[...]: Class ... is implemented in both...
    One of the two will be used. Which one is undefined.

Capture and parse only stdout.  Otherwise we might configure test
behavior for the wrong version of Xcode.
 2021-06-18 14:04:32 -04:00
Brad King
acd82e4690 Merge topic 'fix-flow-control-override' into release-3.20 
c017098d4d CMake: Allow override of unexpected non-flow-control commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6232
 2021-06-17 06:47:42 -04:00
Brad King
cd73f3736b Merge topic 'vs-map-external-warnings' into release-3.20 
947f0c8b81 VS: Do not apply '/external:W*' flag table mapping on VS < 16.10
e59a208b69 cmGlobalVisualStudio10Generator: Adopt GetVSInstanceVersion method
d6d4af0ec3 cmGlobalVisualStudio10Generator: Move static functions to anonymous namespace

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6233
 2021-06-17 06:45:57 -04:00
Brad King
947f0c8b81 VS: Do not apply '/external:W*' flag table mapping on VS < 16.10 
Since commit 9054cd05e6 (VS: Add flag table entries for '/external:W*'
flags in VS 16.10, 2021-05-28, v3.20.4~10^2) we map flags to the
`ExternalWarningLevel` element.  VS 16.9 does not support that element,
but its `cl` compiler does support the `/external:W*` flags.  Filter out
the flag table entry on older VS versions.

Fixes: #22308
 2021-06-16 11:08:15 -04:00
Brad King
e59a208b69 cmGlobalVisualStudio10Generator: Adopt GetVSInstanceVersion method 
Port from `cmGlobalVisualStudioVersionedGenerator`.
 2021-06-16 10:57:15 -04:00
Brad King
d6d4af0ec3 cmGlobalVisualStudio10Generator: Move static functions to anonymous namespace 2021-06-16 10:57:14 -04:00
Kyle Edwards
c017098d4d CMake: Allow override of unexpected non-flow-control commands 
Fixes: #22310
 2021-06-16 10:39:39 -04:00
Brad King
a9ff600a50 Merge topic 'ci-xcode-12.5' into release-3.20 
9c98878451 gitlab-ci: update macOS jobs to use Xcode 12.5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6229
 2021-06-16 08:14:41 -04:00
Brad King
9c98878451 gitlab-ci: update macOS jobs to use Xcode 12.5 2021-06-15 15:42:08 -04:00
Brad King
b61fe6a831 CMake 3.20.4 v3.20.4 2021-06-14 11:05:49 -04:00
Brad King
a7ad3a5f92 Merge topic 'help-cmake_path-IS_PREFIX' into release-3.20 
e49cbf1d44 Help: cmake_path: fix erroneous example for IS_PREFIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6223
 2021-06-14 09:44:14 -04:00
Brad King
43c42e12c8 Merge topic 'fileapi-link-fragments' into release-3.20 
68bbec66e0 fileapi: Fix codemodel-v2 link command fragment relative paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6220
 2021-06-14 09:41:50 -04:00
Marc Chevrier
e49cbf1d44 Help: cmake_path: fix erroneous example for IS_PREFIX 2021-06-12 11:22:40 +02:00
Brad King
68bbec66e0 fileapi: Fix codemodel-v2 link command fragment relative paths 
Use the same `cmLinkLineComputer` subclass as the generator does.  This
affects the base directory from which relative paths are computed.

Fixes: #22301
 2021-06-11 11:11:36 -04:00
Brad King
e3c420a74f Merge topic 'presets-build-fixes' into release-3.20 
534c40e6d8 presets: Fix buildPreset "targets" not allowing a single string
5d67632813 presets: Fix buildPreset "jobs"
93e396b402 presets: Fix buildPreset "jobs" field test case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !6190
 2021-06-09 07:57:34 -04:00
Brad King
12fc4f1239 Merge topic 'irsl-intel-oneapi-windows' into release-3.20 
6d4c51c29e IRSL: Add Intel oneAPI redist location on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6199
 2021-06-09 07:56:28 -04:00
Brad King
6d4c51c29e IRSL: Add Intel oneAPI redist location on Windows 
Fixes: #22283
 2021-06-08 09:07:37 -04:00
Sam Freed
534c40e6d8 presets: Fix buildPreset "targets" not allowing a single string 
Fixes: #22272
 2021-06-08 07:47:54 -04:00
Sam Freed
5d67632813 presets: Fix buildPreset "jobs" 
Fixes: #22273
 2021-06-08 07:47:24 -04:00
Brad King
93e396b402 presets: Fix buildPreset "jobs" field test case 
Avoid passing parallel build options to Make tools that do not support
them.
 2021-06-08 07:47:20 -04:00
Brad King
f092fe677f Merge topic 'FindBoost-json-header' into release-3.20 
c44dfdfdbb FindBoost: Add check for json component header in Boost 1.75+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6193
 2021-06-07 13:22:03 -04:00
John Drouhard
c44dfdfdbb FindBoost: Add check for json component header in Boost 1.75+ 
In commit 8293064760 (FindBoost: Add support for Boost 1.75, 2021-02-03,
v3.19.5~9^2) the dependencies of the json component were added, but the
header listing was left out.
 2021-06-04 13:43:54 -04:00
Brad King
451b1a8321 Merge topic 'ci-sccache-consistent-builds' into release-3.20 
9d7ebb47ea ci: use consistent sccache builds

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6156
 2021-06-04 06:53:46 -04:00
Ben Boeckel
9d7ebb47ea ci: use consistent sccache builds 2021-06-02 15:43:16 -04:00
Brad King
e092ded1a1 Merge topic 'msvc_cxx20_23' into release-3.20 
886e27062b Clang/MSVC: C++20 final flag, C++23 support
3aaf1d91bf MSVC: C++20 final flag, C++23 support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Acked-by: Michael Hirsch <michael@scivision.dev>
Merge-request: !6174
 2021-06-02 07:32:30 -04:00
Raul Tambre
886e27062b Clang/MSVC: C++20 final flag, C++23 support 
Added in LLVM commit a8f75d497daa2684a03909d7c31d5bce11b427e1, will be released
in 13.0.
 2021-05-29 19:44:10 +03:00
Brad King
105b01b8d4 Merge topic 'fix-compile-db-crash' into release-3.20 
316cbbe8d5 Makefiles: Fix CMAKE_EXPORT_COMPILE_COMMANDS crash with custom compile rule

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6173
 2021-05-29 09:45:33 -04:00
Raul Tambre
3aaf1d91bf MSVC: C++20 final flag, C++23 support 
Microsoft intends to ship the final C++20 flag in VS 16.11 albeit with a few
parts missing due planned ABI breaking changes.
The current 16.11 Preview 1 toolchain version is 19.29.30129.3, so let's
restrict based on that.
 2021-05-29 13:35:45 +03:00
Brad King
316cbbe8d5 Makefiles: Fix CMAKE_EXPORT_COMPILE_COMMANDS crash with custom compile rule 
Extend the fix from commit 67e2130c96 (Makefiles: Fix
CMAKE_EXPORT_COMPILE_COMMANDS crash with custom compile rule,
2020-11-20, v3.19.1~8^2) to work for the `<FLAGS>` placeholder too.
Also fix the test case to actually enable `EXPORT_COMPILE_COMMANDS`
on the test target.

Fixes: #22261
 2021-05-28 15:41:38 -04:00
Brad King
b9ee6db49c Merge topic 'ci-msvc-14.29-16.10' into release-3.20 
59d9fa7131 gitlab-ci: Update Windows builds to MSVC 19.29-16.10 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6172
 2021-05-28 14:24:56 -04:00
Brad King
ddd132072e Merge topic 'vs-16.10-map-external-warnings' into release-3.20 
9054cd05e6 VS: Add flag table entries for '/external:W*' flags in VS 16.10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6171
 2021-05-28 12:52:42 -04:00
Brad King
59d9fa7131 gitlab-ci: Update Windows builds to MSVC 19.29-16.10 toolset 2021-05-28 12:33:53 -04:00
Brad King
f4f80cfec6 Merge topic 'vs-toolset-version' into release-3.20 
a60141feaa VS: Add special case for '-T version=14.29.16.10' under VS 16.10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6169
 2021-05-28 12:24:52 -04:00
Brad King
9054cd05e6 VS: Add flag table entries for '/external:W*' flags in VS 16.10 
Fixes: #22255
 2021-05-28 11:54:57 -04:00
Brad King
a60141feaa VS: Add special case for '-T version=14.29.16.10' under VS 16.10 
Extend the table of special cases from commit 58a50a3a0a (VS: Fix '-T
version=14.28' under VS 16.9, 2021-03-11, v3.19.7~1^2~1).  Add a special
case for the name VS 16.11 will use for VS 16.10's default toolset, so
that it can be used with VS 16.10 too.

Using '-T version=14.29.16.10' actually works under VS 16.10 without
this change, but only because there is only one 14.29 toolset so the
two-component prefix happens to match the right one.  Make it explicit.

Issue: #21922
 2021-05-27 17:06:27 -04:00
Brad King
13d112ea03 CMake 3.20.3 v3.20.3 2021-05-27 14:05:04 -04:00
Brad King
35a7dcb493 Merge topic 'cmp0082-exclude-from-all' into release-3.20 
38f2562d5b CMP0082: Check EXCLUDE_FROM_ALL property at generate time

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6158
 2021-05-25 10:00:34 -04:00
Kyle Edwards
38f2562d5b CMP0082: Check EXCLUDE_FROM_ALL property at generate time 
Fixes: #22234
 2021-05-24 13:56:59 -04:00
Brad King
fe9988add3 Merge topic 'git-config-version-check' into release-3.20 
8a9753e427 ExternalProject: Only add git config setting with git 1.7.7 or later

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6145
 2021-05-21 10:36:56 -04:00
Craig Scott
8a9753e427 ExternalProject: Only add git config setting with git 1.7.7 or later 
1cb65e680d (ExternalProject: Prevent the noisy detached head
messages on checkout, 2021-01-17) unconditionally added the advice.detachedHead
git config setting, but it requires git 1.7.7 or later. Since it isn't fatal to not
have it, just noisier, only add it when it is supported.

Fixes: #22206
 2021-05-20 22:39:04 +10:00
Brad King
c23e2fa0c5 Merge topic 'nvhpc-ninja-depfile' into release-3.20 
364f6af1d7 NVHPC: Support Ninja dependency scanning
521cfc38a3 NVHPC: Support explicit language flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6136
 2021-05-19 07:54:41 -04:00
Robert Maynard
364f6af1d7 NVHPC: Support Ninja dependency scanning 
Fixes: #22168
 2021-05-18 12:56:46 -04:00
Robert Maynard
521cfc38a3 NVHPC: Support explicit language flags 2021-05-18 11:30:01 -04:00
Brad King
3a4bb26953 Merge topic 'sphinx-4' into release-3.20 
bb9c69ed70 Utilities/Sphinx: Update man page config for Sphinx 4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6126
 2021-05-14 10:55:16 -04:00
Brad King
bb9c69ed70 Utilities/Sphinx: Update man page config for Sphinx 4 
Sphinx 4 by default generates `man/#/foo.#`, but older versions generate
`man/foo.#` as our install rules expect.  Update our Sphinx config file
to tell Sphinx 4 to use the old layout.

Fixes: #22192
 2021-05-14 10:30:34 -04:00