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,548 Commits 2 Branches 375 Tags
2992d13b8dd324424e62db5062d3f0211054881f
Commit Graph

53548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
2992d13b8d Merge branch 'release-3.21' 2021-06-21 09:59:57 -04:00
Brad King
7b0cf0da9d Merge topic 'tutorial-sphinx-targets' 
73898c4922 Tutorial: Make code snippets linkable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6247
 2021-06-21 09:59:57 -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
6c95f1cd44 Merge branch 'release-3.21' 2021-06-21 09:58:04 -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
9612034cac Merge topic 'doc-source_group-scope' 
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
0db9483923 Merge branch 'release-3.21' 2021-06-21 09:56:49 -04:00
Brad King
69b64ed85a Merge topic 'GNUInstallDirs-alpine' 
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:49 -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
a01a88dc95 Merge topic 'FindPkgConfig-PKG_CONFIG-args' 
35d3e00e4e FindPkgConfig: split args if loaded from environment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6222
 2021-06-21 09:53:51 -04:00
Brad King
d60d6c269a Merge topic 'ctest_runtime_labels' 
bd38749fd4 ctest: allow test output to add labels

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6234
 2021-06-21 09:52:36 -04:00
Brad King
cbdd6747ad Merge topic 'msvc-isystem' 
f29e1874ad Compiler/MSVC: use the `-external:I` flag for system includes
5a5c85dffd Tests/IncludeDirectories: support MSVC in system include tests
399a3204bb Tests/IncludeDirectories: align sibling predicates
20ab49193b Tests/IncludeDirectories: factor out applying flags to targets
809f7b0c3a Tests/IncludeDirectories: fix copy pasta for otherlib
b094324948 Tests/IncludeDirectories: Include system headers via angle brackets
8f63f3b04e cmVisualStudio10TargetGenerator: remove unused variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Julien Waechter <greenjava@gmail.com>
Acked-by: DE-VS wenglor <devs.wenglor@gmail.com>
Merge-request: !4766
 2021-06-21 09:50:52 -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
Brad King
28f4686fc6 Merge branch 'release-3.21' 2021-06-21 09:46:30 -04:00
Brad King
d4f2b1f3c1 Merge topic 'compiler-id-lang-vars' 
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
Kitware Robot
858164d155 CMake Nightly Date Stamp 2021-06-21 00:01:20 -04:00
Kitware Robot
93a63425b6 CMake Nightly Date Stamp 2021-06-20 00:02:10 -04:00
Kitware Robot
4e518a852a CMake Nightly Date Stamp 2021-06-19 00:01:13 -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
Christopher Degawa
35d3e00e4e FindPkgConfig: split args if loaded from environment 
It's common for some people to use the PKG_CONFIG environment variable
to not only load a custom pkg-config/pkgconf but also to load some
default arguments such as `--static` or `--keep-system-libs` which often
worked since shell scripts would call `$PKG_CONFIG --libs pkg` without
quotes, but this breaks FindPkgConfig since it uses the full string as
`argv[0]` and might try looking for a binary called `pkgconf --static`,
instead of looking for `pkgconf` and adding `--static` as the `argv[1]`

Additionally adds RunCMake.FindPkgConfig ARGN test case

Fixes: #22305
Signed-off-by: Christopher Degawa <ccom@randomderp.com>
 2021-06-18 11:10:12 -04:00
Ben Boeckel
f29e1874ad Compiler/MSVC: use the -external:I flag for system includes 
See: #17904
 2021-06-18 09:54:17 -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
bc28bba68d Merge branch 'release-3.21' 2021-06-18 09:39:24 -04:00
Brad King
c35273c22d Merge topic 'vs-utf-8' 
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
94aa4a1bf2 Merge branch 'release-3.21' 2021-06-18 09:38:27 -04:00
Brad King
57322b572d Merge topic 'vs-flag-tables' 
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:27 -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
2778813937 Merge branch 'release-3.21' 2021-06-18 09:37:09 -04:00
Brad King
bbe29710ae Merge topic 'gcc11-errors' 
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:09 -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
Kitware Robot
5ef8c09a8f CMake Nightly Date Stamp 2021-06-18 00:01:12 -04:00
Zack Galbreath
bd38749fd4 ctest: allow test output to add labels 
Parse test output for <CTestLabel>...</CTestLabel>.
If found, add this value to the list of labels associated with this test.
 2021-06-17 14:09:01 -04:00
Ben Boeckel
5a5c85dffd Tests/IncludeDirectories: support MSVC in system include tests 2021-06-17 14:02:52 -04:00
Ben Boeckel
399a3204bb Tests/IncludeDirectories: align sibling predicates 2021-06-17 14:02:52 -04:00
Ben Boeckel
20ab49193b Tests/IncludeDirectories: factor out applying flags to targets 2021-06-17 14:02:52 -04:00
Ben Boeckel
809f7b0c3a Tests/IncludeDirectories: fix copy pasta for otherlib 2021-06-17 14:02:52 -04:00
Brad King
b094324948 Tests/IncludeDirectories: Include system headers via angle brackets 
This is typically how projects include them, and cl's `-external:{I,W}`
flags suppress warnings only when included through angle brackets.
 2021-06-17 14:02:52 -04:00
Ben Boeckel
8f63f3b04e cmVisualStudio10TargetGenerator: remove unused variable 2021-06-17 14:02:52 -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
11695f5985 Begin post-3.21 development 2021-06-17 13:18:30 -04:00
Brad King
2d335de47d Merge branch 'release-3.21' 2021-06-17 13:17:49 -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