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
53,523 Commits 2 Branches 375 Tags
dec927716e29d87f9809fc4193f2c4ce43f5745b
Commit Graph

53523 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
dec927716e Merge branch 'release-3.20' into release-3.21 2021-06-21 10:06:46 -04:00
Brad King
b948b46668 Merge topic 'ep-git-update-commit-ref' into release-3.21 
360ff17dc6 ExternalProject: Use ${ref}^0 to avoid MSYS/Cygwin shell substitutions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6249
 2021-06-21 10:03:36 -04:00
Brad King
782b6bfc26 Merge topic 'test-xcode-13' into release-3.21 
1dd0eae4fc Tests: Fix xcode version detection for Xcode 13 on ARM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6248
 2021-06-21 10:01:25 -04:00
Brad King
6438a03c73 Merge topic 'tutorial-sphinx-targets' into release-3.21 
73898c4922 Tutorial: Make code snippets linkable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6247
 2021-06-21 09:59:56 -04:00
Brad King
375e14b5fe Merge topic 'doc-source_group-scope' into release-3.21 
2abce79409 Help: Clarify the usage scope of source_group

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6246
 2021-06-21 09:58:04 -04:00
Brad King
ed5bd39baa Merge topic 'GNUInstallDirs-alpine' into release-3.21 
37b24e0bed GNUInstallDirs: don't use lib64 on Alpine Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6244
 2021-06-21 09:56:48 -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
Brad King
3a66a58fc1 Merge topic 'compiler-id-lang-vars' into release-3.21 
c8eb357738 CompilerId: Tolerate variables named for languages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6243
 2021-06-21 09:46:30 -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
Heiko Thiel
2abce79409 Help: Clarify the usage scope of source_group 
Fixes: #18856
 2021-06-18 12:52:43 -04:00
Brad King
73898c4922 Tutorial: Make code snippets linkable 
Extend the change from commit 9e5bbb69ea (Tutorial: Add captions for
code blocks, 2021-06-11) to also add a Sphinx named target to code
blocks.  Name each target after the change the code block makes.
 2021-06-18 12:31:45 -04:00
Natanael Copa
37b24e0bed GNUInstallDirs: don't use lib64 on Alpine Linux 
Fixes: #22318
 2021-06-18 11:16:18 -04:00
Philippe Canal
c8eb357738 CompilerId: Tolerate variables named for languages 
If a project or user sets a variable or cache entry named `C`, `CXX`,
`CUDA`, `Fortran`, `CSharp`, or `ISPC`, we were previously comparing
each enabled language name to the value of that variable, rather than
the name itself.  Double-quote the string to take advantage of policy
`CMP0054`, but also add "x" prefixes to support projects that do not set
the policy.

This extends a similar fix in commit bd16a985fc (CompilerId/Features:
Tolerate variables named for languages, 2021-04-28) in more places.  In
particular, ensure that we consider the proper list of compiler ids.

Issue: #22125
 2021-06-18 09:41:08 -04:00
Brad King
d64d2d12c3 Merge topic 'vs-utf-8' into release-3.21 
9ba99a1203 VS: Add support for Utf8Enconding when using VS 16.10+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6238
 2021-06-18 09:39:24 -04:00
Brad King
333e1973ce Merge topic 'vs-flag-tables' into release-3.21 
b0f830ced6 VS: Do not apply any '/external:*' flag table mapping on VS < 16.10
3fd65f5ca6 VS: Compare VS instance versions as strings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6241
 2021-06-18 09:38:26 -04:00
Brad King
efc3e25790 Merge topic 'gcc11-errors' into release-3.21 
701773f1da CheckCompilerFlag: Handle -Werror= for GCC 11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6242
 2021-06-18 09:37:08 -04:00
Gustavo Varo
9ba99a1203 VS: Add support for Utf8Enconding when using VS 16.10+ 
On VS 16.10 Preview 2 or above, generate `UseUtf8Encoding`
instead of `StdOutEncoding=UTF-8` in `.vcxproj` files.

Fixes: #22032
 2021-06-17 13:44:22 -04:00
Marc Aldorasi
701773f1da CheckCompilerFlag: Handle -Werror= for GCC 11 2021-06-17 13:39:48 -04:00
Brad King
22fb0713a2 Begin 3.21 release versioning 2021-06-17 13:17:06 -04:00
Brad King
f52b5aba20 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-06-17 13:15:33 -04:00
Brad King
d59b76f7b4 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-06-17 13:14:21 -04:00
Brad King
8850f6e23f Merge topic 'doc-3.21-relnotes' 
f119fbeec5 Help: Update Sphinx versionadded directives for 3.21 release
45acb61432 Help: Organize and revise 3.21 release notes
046aee0441 Help: Consolidate 3.21 release notes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6226
 2021-06-17 13:09:45 -04:00
Brad King
0b394894b9 Merge topic 'help-tutorial-separate-pages' 
9c703ff741 Tutorial: Add infrastructure to preserve old links when renaming steps
9e5bbb69ea Tutorial: Add captions for code blocks
fe60154fe8 Tutorial: Small formatting improvements
25dde20cc5 Tutorial: Fix links after splitting steps
d1c3e7e78a Tutorial: Split steps into separate files
13fdb26323 Tutorial: Break up intro paragraph
8406d4c1d1 Utilities/Sphinx: Index guide section documents for cross-referencing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Juan Ramos <juanr.dev+gitlab@protonmail.com>
Merge-request: !6217
 2021-06-17 13:08:29 -04:00
Brad King
9c703ff741 Tutorial: Add infrastructure to preserve old links when renaming steps 2021-06-17 12:10:14 -04:00
Josef Angstenberger
9e5bbb69ea Tutorial: Add captions for code blocks 2021-06-17 11:57:56 -04:00
Josef Angstenberger
fe60154fe8 Tutorial: Small formatting improvements 
- Use inline literals for all code fragments and names.
- Add missing console code-blocks.
- Always use c++, not c as code language.
 2021-06-17 11:57:56 -04:00
Josef Angstenberger
25dde20cc5 Tutorial: Fix links after splitting steps 2021-06-17 11:55:18 -04:00
Josef Angstenberger
d1c3e7e78a Tutorial: Split steps into separate files 
Fixes: #21737
 2021-06-17 11:53:55 -04:00
Brad King
13fdb26323 Tutorial: Break up intro paragraph 2021-06-17 10:33:07 -04:00
Brad King
8406d4c1d1 Utilities/Sphinx: Index guide section documents for cross-referencing 
Extend the change from commit 6185265800 (Utilities/Sphinx: Index
guide-level documents for cross-referencing, 2019-12-06,
v3.17.0-rc1~181^2~1) to name guide documents other than the top level
using their docname instead of their title.  This will allow them to be
cross-referenced by a stable name even if their title changes.
 2021-06-17 09:55:56 -04:00
Brad King
f119fbeec5 Help: Update Sphinx versionadded directives for 3.21 release 
Run the script:

    Utilities/Sphinx/update_versions.py --since v3.20.0 --overwrite

Manually remove directives generated in documents for long-existing
features for which documentation was added.
 2021-06-17 09:48:54 -04:00
Brad King
45acb61432 Help: Organize and revise 3.21 release notes 
Add section headers similar to the 3.20 release notes and move each
individual bullet into an appropriate section.  Revise a few bullets.
 2021-06-17 08:47:49 -04:00
Brad King
b0f830ced6 VS: Do not apply any '/external:*' flag table mapping on VS < 16.10 
Since commit 887e9df0c7 (VS: Update v142 CL flag table for VS 16.10,
2021-06-04) we map several `/external:*` flags to their corresponding
`.vcxproj` elements.  These elements were added to `cl.xml` in VS 16.10,
so filter them out in older VS versions.  Add a field to the json flag
table format to specify the minimum version of VS needed for a given
mapping.

Issue: #22308
 2021-06-17 08:25:04 -04:00
Brad King
3fd65f5ca6 VS: Compare VS instance versions as strings 
This makes the values more readable.
 2021-06-17 07:54:48 -04:00
Brad King
c92595be1d Merge topic 'c_17_23-AppleClang' 
b642022046 AppleClang: Add flags for C17 and C23

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6231
 2021-06-17 06:49:15 -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
07ae952d88 Merge branch 'release-3.20' 2021-06-17 06:47:42 -04:00
Brad King
1aa16906e6 Merge topic 'fix-flow-control-override' 
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
3cb0cb9b09 Merge branch 'release-3.20' 2021-06-17 06:45:58 -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
e05cf2d2de Merge topic 'vs-map-external-warnings' 
ab3830401f Merge branch 'backport-3.20-vs-map-external-warnings'
e4ca525d84 VS: Do not apply '/external:W*' flag table mapping on VS < 16.10
aabc3ca47d cmGlobalVisualStudio10Generator: Adopt GetVSInstanceVersion method
e66a7fe07b cmGlobalVisualStudio10Generator: Move static functions to anonymous namespace
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
54860f1f6b Merge topic 'ci-clang' 
886a97cbe7 gitlab-ci: add job to test with clang-7 and ninja on debian10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6237
 2021-06-17 06:36:32 -04:00
Brad King
4941bf5995 Merge topic 'ci-cuda' 
f7af01efb6 gitlab-ci: add job testing cuda10.2 with clang 11
9548b059c0 ci: add clang-11 to cuda10.2 base image

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6236
 2021-06-17 06:35:39 -04:00
Kitware Robot
e80f56a7e5 CMake Nightly Date Stamp 2021-06-17 00:03:04 -04:00
Brad King
b642022046 AppleClang: Add flags for C17 and C23 
Follow up commit 72f4984cdc (Clang: C23 support, 2021-02-07).
 2021-06-16 15:50:55 -04:00
Brad King
886a97cbe7 gitlab-ci: add job to test with clang-7 and ninja on debian10 
In commit 7e5e558d0f (gitlab-ci: add job to test with clang-7 on
debian10, 2021-06-04) we added coverage of clang-7 with the Unix
Makefiles generator.  Do the same for Ninja.
 2021-06-16 14:57:34 -04:00
Brad King
f7af01efb6 gitlab-ci: add job testing cuda10.2 with clang 11 2021-06-16 14:25:38 -04:00
Brad King
9548b059c0 ci: add clang-11 to cuda10.2 base image 2021-06-16 14:18:09 -04:00