summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Help: Clarify 3.21 release note on supportedPlatformsBrad King2021-06-281-3/+3
| | | | | | Avoid implying that the field is always present. Fixes: #22352
* Merge topic 'vs2022' into release-3.21Brad King2021-06-2824-28/+252
|\ | | | | | | | | | | | | | | | | | | 93c718791e VS: Use 64-bit MSBuild in VS 2022 c46b265839 VS: Add Visual Studio 17 2022 generator b610b7a35c VS: Update v142 CL flag table for VS 17.0 Preview 1 43375c6418 Help: Remove unnecessary Sphinx versionadded markup in VS toolset selection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6268
| * VS: Use 64-bit MSBuild in VS 2022Brad King2021-06-251-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Visual Studio 17 2022 is now a 64-bit native application. It places the 64-bit `MSBuild.exe` in the `PATH` of VS command prompts, so prefer it for this version and above. This was previously attempted for older VS versions, but reverted by commit f3cedf381e (VS: Revert "Use MSBuild matching toolset host architecture", 2019-03-12, v3.14.0~1^2). For now, do not use the 64-bit MSBuild for VS 16 and below. Fixes: #18219
| * VS: Add Visual Studio 17 2022 generatorBrad King2021-06-2518-14/+218
| | | | | | | | Fixes: #22339
| * VS: Update v142 CL flag table for VS 17.0 Preview 1Brad King2021-06-251-0/+7
| | | | | | | | | | | | | | | | | | | | Run the command python3 Source/cmConvertMSBuildXMLToJSON.py -t v142 \ 'c:/.../MSBuild/Microsoft/VC/v160/1033/cl.xml' To generate `v142_CL.json` locally. Manually move new and updated settings over to `Templates/MSBuild/FlagTables/v142_CL.json`.
| * Help: Remove unnecessary Sphinx versionadded markup in VS toolset selectionBrad King2021-06-255-14/+21
| | | | | | | | | | In a document that says "New in version 3.14", we do not need any blocks that say "New in version 3.8".
* | Merge topic 'test-RunCMake.GenEx-names' into release-3.21Brad King2021-06-28221-176/+176
|\ \ | | | | | | | | | | | | | | | | | | a95cbf3890 Tests: Shorten RunCMake.GenEx-* case names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6269
| * | Tests: Shorten RunCMake.GenEx-* case namesBrad King2021-06-25221-176/+176
| |/ | | | | | | Reduce the length of the longest path on disk needed by the tests.
* | Merge topic 'ninja-lwyu-flag-order' into release-3.21Brad King2021-06-281-6/+3
|\ \ | | | | | | | | | | | | | | | | | | d7159f9591 Ninja: Fix LINK_WHAT_YOU_USE link flag placement Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6263
| * | Ninja: Fix LINK_WHAT_YOU_USE link flag placementĐoàn Trần Công Danh2021-06-251-6/+3
| |/ | | | | | | | | | | | | Move `-Wl,--no-as-needed` from the `<FLAGS>` placeholder to `<LINK_FLAGS>`, as it is in the Makefile generators. Fixes: #22342
* | Merge topic 'yasm-no-deps' into release-3.21Brad King2021-06-281-7/+9
|\ \ | |/ |/| | | | | | | | | f03d54bfc1 ASM_NASM: Do not generate depfiles with YASM Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6265
| * ASM_NASM: Do not generate depfiles with YASMGregor Jasny2021-06-251-7/+9
| | | | | | | | | | | | | | | | In 3aec26660a (Merge topic 'nasm_add_deps', 2021-03-03) the ASM_NASM language enabled the generation of GCC compatible depfiles for NASM. Unfortunatly, those are not supported by YASM. Fixes: #22341
* | Merge topic 'Help-UseJava-reorganization' into release-3.21Brad King2021-06-251-351/+454
|\ \ | | | | | | | | | | | | | | | | | | af9bd6c53f Help: UseJava reorganization Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6262
| * | Help: UseJava reorganizationMarc Chevrier2021-06-241-351/+454
| |/ | | | | | | Fixes: #22155
* | Merge topic 'fujitsu-ipo' into release-3.21Brad King2021-06-251-0/+10
|\ \ | | | | | | | | | | | | | | | | | | 96e362fdc9 Fujitsu: Add IPO support for Fortran Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6261
| * | Fujitsu: Add IPO support for FortranPaul Zehner2021-06-241-0/+10
| |/
* | Merge topic 'FindOpenMP-fujitsu' into release-3.21Brad King2021-06-251-0/+4
|\ \ | |/ |/| | | | | | | | | b3bf33539b FindOpenMP: Link with OpenMP flags on Fujitsu Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6260
| * FindOpenMP: Link with OpenMP flags on FujitsuEisuke Kawashima2021-06-241-0/+4
|/ | | | Fixes: #22332
* Merge topic 'bootstrap-_FILE_OFFSET_BITS-64' into release-3.21Brad King2021-06-241-0/+10
|\ | | | | | | | | | | | | a4b6743a3b bootstrap: Compile with _FILE_OFFSET_BITS=64 on Linux Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6259
| * bootstrap: Compile with _FILE_OFFSET_BITS=64 on LinuxBrad King2021-06-231-0/+10
|/ | | | | | | | | | | To avoid problems accessing filesystem, explicitly use 64-bit file offsets in case the compilation model is 32-bit. This change was made for the main CMake build by commit 5b10f96793 (Linux: Compile with _FILE_OFFSET_BITS=64 on 32-bit Linux, 2020-09-23, v3.19.0-rc1~112^2), but conditionally on 32-bit Linux. For bootstrap, just always add the definition instead of trying to detect the architecture. Fixes: #22328
* CMake 3.21.0-rc1v3.21.0-rc1Brad King2021-06-231-1/+1
|
* Merge topic 'cuda-rules-override' into release-3.21Brad King2021-06-231-0/+19
|\ | | | | | | | | | | | | 1d9009c27a CUDA: Implement CMAKE_USER_MAKE_RULES_OVERRIDE[_CUDA] Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6253
| * CUDA: Implement CMAKE_USER_MAKE_RULES_OVERRIDE[_CUDA]Seth R Johnson2021-06-221-0/+19
|/ | | | | This is implemented by other languages, and is documented for all languages. This was accidentally left out of CUDA.
* Merge branch 'release-3.20' into release-3.21Brad King2021-06-211-0/+7
|\
| * CMake 3.20.5v3.20.5Brad King2021-06-211-1/+1
| |
| * Help: Add 3.20 release note section for 3.20.{3,4,5}Brad King2021-06-211-0/+7
| | | | | | | | | | | | 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.
* | Merge branch 'release-3.20' into release-3.21Brad King2021-06-210-0/+0
|\ \ | |/
| * Merge branch 'test-xcode-13' into release-3.20Brad King2021-06-212-2/+2
| |\ | | | | | | | | | Merge-request: !6248
| * \ Merge branch 'ep-git-update-commit-ref' into release-3.20Brad King2021-06-211-1/+1
| |\ \ | | | | | | | | | | | | Merge-request: !6249
* | \ \ Merge topic 'ep-git-update-commit-ref' into release-3.21Brad King2021-06-211-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 360ff17dc6 ExternalProject: Use ${ref}^0 to avoid MSYS/Cygwin shell substitutions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6249
| * | | ExternalProject: Use ${ref}^0 to avoid MSYS/Cygwin shell substitutionsCraig Scott2021-06-201-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge topic 'test-xcode-13' into release-3.21Brad King2021-06-212-2/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 1dd0eae4fc Tests: Fix xcode version detection for Xcode 13 on ARM Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6248
| * | Tests: Fix xcode version detection for Xcode 13 on ARMBrad King2021-06-182-2/+2
| |/ | | | | | | | | | | | | | | | | | | 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.
* | Merge topic 'tutorial-sphinx-targets' into release-3.21Brad King2021-06-2112-0/+52
|\ \ | | | | | | | | | | | | | | | | | | 73898c4922 Tutorial: Make code snippets linkable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6247
| * | Tutorial: Make code snippets linkableBrad King2021-06-1812-0/+52
| | | | | | | | | | | | | | | | | | 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.
* | | Merge topic 'doc-source_group-scope' into release-3.21Brad King2021-06-211-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2abce79409 Help: Clarify the usage scope of source_group Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6246
| * | | Help: Clarify the usage scope of source_groupHeiko Thiel2021-06-181-0/+3
| |/ / | | | | | | | | | Fixes: #18856
* | | Merge topic 'GNUInstallDirs-alpine' into release-3.21Brad King2021-06-211-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | GNUInstallDirs: don't use lib64 on Alpine LinuxNatanael Copa2021-06-181-0/+1
| |/ / | | | | | | | | | Fixes: #22318
* | | Merge topic 'compiler-id-lang-vars' into release-3.21Brad King2021-06-211-6/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | c8eb357738 CompilerId: Tolerate variables named for languages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6243
| * | CompilerId: Tolerate variables named for languagesPhilippe Canal2021-06-181-6/+6
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge topic 'vs-utf-8' into release-3.21Brad King2021-06-184-1/+22
|\ \ | | | | | | | | | | | | | | | | | | 9ba99a1203 VS: Add support for Utf8Enconding when using VS 16.10+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6238
| * | VS: Add support for Utf8Enconding when using VS 16.10+Gustavo Varo2021-06-174-1/+22
| | | | | | | | | | | | | | | | | | | | | On VS 16.10 Preview 2 or above, generate `UseUtf8Encoding` instead of `StdOutEncoding=UTF-8` in `.vcxproj` files. Fixes: #22032
* | | Merge topic 'vs-flag-tables' into release-3.21Brad King2021-06-187-30/+36
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | 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
| * | VS: Do not apply any '/external:*' flag table mapping on VS < 16.10Brad King2021-06-172-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | VS: Compare VS instance versions as stringsBrad King2021-06-176-25/+21
| | | | | | | | | | | | This makes the values more readable.
* | | Merge topic 'gcc11-errors' into release-3.21Brad King2021-06-181-2/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | CheckCompilerFlag: Handle -Werror= for GCC 11Marc Aldorasi2021-06-171-2/+4
| |/ /
* | | Begin 3.21 release versioningBrad King2021-06-171-3/+3
| | |
* | | gitlab-ci: Drop package pipeline upload jobs for release branchBrad King2021-06-171-7/+7
| | | | | | | | | | | | | | | The package pipeline for release versions should not upload packages automatically to our archive of nightly development versions.