summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cuda-arch-verify'Brad King2022-05-036-6/+26
|\ | | | | | | | | | | | | | | 7bf5200699 CUDA: Restore CMAKE_CUDA_ARCHITECTURES support for -real and -virtual suffixes Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewd-by: Raul Tambre <raul@tambre.ee> Merge-request: !7218
| * CUDA: Restore CMAKE_CUDA_ARCHITECTURES support for -real and -virtual suffixesBrad King2022-04-296-6/+26
| | | | | | | | | | | | Fix the validation regex added by commit c267ed205a (CUDA: Defer architecture testing to the compiler testing step, 2022-04-25) to allow these values.
* | Merge branch 'release-3.23'Brad King2022-05-030-0/+0
|\ \
| * \ Merge topic 'avoid-remove-empty-path' into release-3.23Brad King2022-05-031-1/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71ded12a75 cmGeneratedFileStream: Do not remove empty path Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7223
* | \ \ Merge topic 'avoid-remove-empty-path'Brad King2022-05-031-1/+3
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 71ded12a75 cmGeneratedFileStream: Do not remove empty path Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7223
| * | | cmGeneratedFileStream: Do not remove empty pathBrad King2022-04-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If `Close()` is called when a file was never opened, we have no temporary file path. Do not try to remove it. Some implementations of `unlink()` crash on an empty path (though the documented behavior is to fail with `ENOENT`). Fixes: #23414
* | | | Merge branch 'release-3.23'Brad King2022-05-030-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'restore-CPACK_PACKAGEMAKER_CHOICES' into release-3.23Brad King2022-05-033-21/+108
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | d099136add productbuild: Restore CPACK_PACKAGEMAKER_CHOICES variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7220
* | | | Merge topic 'restore-CPACK_PACKAGEMAKER_CHOICES'Brad King2022-05-033-21/+108
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | d099136add productbuild: Restore CPACK_PACKAGEMAKER_CHOICES variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7220
| * | | productbuild: Restore CPACK_PACKAGEMAKER_CHOICES variableCraig Scott2022-04-293-21/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 2a8df7e7db (productbuild: Don't write rootVolumeOnly attribute if writing domains, 2022-03-21), the variable holding the main contents of the distribution.dist XML file was renamed from CPACK_PACKAGEMAKER_CHOICES to CPACK_APPLE_PKG_INSTALLER_CONTENT. This reflected the fact that the PackageMaker generator is deprecated. The new variable also includes more details than the old one held. Some projects were relying on the old variable name, so we need to still set that to the same contents as it would have previously provided. Neither of these variables were previously documented, but the older variable was mentioned in enough semi-official places that it essentially became semi-supported. Document both variables and highlight that the older one is deprecated. Fixes: #23467
* | | | Merge topic 'update-curl'Brad King2022-05-03147-4573/+4738
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 30aba1ce8c Merge branch 'upstream-curl' into update-curl 2a9bc9ebf0 curl 2022-04-27 (1669b17d) 5239672e64 curl: Update script to get curl 7.83.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7219
| * \ \ \ Merge branch 'upstream-curl' into update-curlBrad King2022-04-28146-4572/+4737
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2022-04-27 (1669b17d)
| | * | | | curl 2022-04-27 (1669b17d)Curl Upstream2022-04-28146-4570/+4737
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit 1669b17d3a1a1fd824308544ca0ec02a2a4f50ea (curl-7_83_0).
| * | | | | curl: Update script to get curl 7.83.0Brad King2022-04-281-1/+1
| | | | | |
* | | | | | Merge topic 'cpp-modules-prep'Brad King2022-05-0312-91/+157
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c5b56b35c2 cmInstallExportGenerator: expose the temporary directory c107760417 cmNinjaTargetGenerator: support msvc-style deps discovery for scanning 64c15ec018 cmNinjaTargetGenerator: add flags for scanning based on the fileset type aaa18f15cf cmTarget: add support for querying all file set names cc4e19710d cmGlobalNinjaGenerator: use an extention based on the modmapfmt 97a68198c9 cmGlobalNinjaGenerator: escape `:` in module names 499009b79c cmTarget: avoid creating export entries if they don't exist 0513a1fe10 cmInstallGenerator: use CMake-private variables in generated code ... Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7214
| * | | | | | cmInstallExportGenerator: expose the temporary directoryBen Boeckel2022-04-285-63/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This needs to be known so that C++ module properties for the install can be staged beside the other files. Always perform the MD5 transformation (in non-bootstrap builds) so that the path can be computed prior to generation (where it used the longest configuration name to detect too-long paths). Update tests to expect the always-present MD5 value. Note that this improves robustness of the test suite as testing in a too-long path may have triggered the MD5 conversion anyways.
| * | | | | | cmNinjaTargetGenerator: support msvc-style deps discovery for scanningBen Boeckel2022-04-272-11/+24
| | | | | | |
| * | | | | | cmNinjaTargetGenerator: add flags for scanning based on the fileset typeBen Boeckel2022-04-272-0/+57
| | | | | | |
| * | | | | | cmTarget: add support for querying all file set namesBen Boeckel2022-04-272-0/+12
| | | | | | |
| * | | | | | cmGlobalNinjaGenerator: use an extention based on the modmapfmtBen Boeckel2022-04-271-1/+6
| | | | | | |
| * | | | | | cmGlobalNinjaGenerator: escape `:` in module namesBen Boeckel2022-04-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all filesystems support `:` in the name, so replace it with `-`. As `-` is not otherwise allowed in module names anyways, there is no risk of conflict.
| * | | | | | cmTarget: avoid creating export entries if they don't existBen Boeckel2022-04-271-1/+6
| | | | | | |
| * | | | | | cmInstallGenerator: use CMake-private variables in generated codeBen Boeckel2022-04-271-8/+15
| | | | | | |
| * | | | | | cmInstallGenerator: fix default argument commentsBen Boeckel2022-04-271-4/+4
| | | | | | |
| * | | | | | cmFileSet: support makefile-less error reporting of visibilityBen Boeckel2022-04-271-3/+6
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2022-05-031-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2022-05-021-1/+1
| | | | | | |
* | | | | | | Merge topic 'enum_set-stabilization'Marc Chevrier2022-05-011-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f42d0c9322 cm::enum_set: fix compilation warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7222
| * | | | | | | cm::enum_set: fix compilation warningMarc Chevrier2022-04-291-1/+5
| | | | | | | |
* | | | | | | | Merge topic 'preset-bash-completion'Craig Scott2022-05-012-1/+48
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7a6e036ad bash-completion: Support CMakePresets in cmake and ctest completion Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Craig Scott <craig.scott@crascit.com> Merge-request: !7148
| * | | | | | | | bash-completion: Support CMakePresets in cmake and ctest completionRobin Linden2022-04-292-1/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Craig Scott <craig.scott@crascit.com>
* | | | | | | | | CMake Nightly Date StampKitware Robot2022-05-011-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2022-04-301-1/+1
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'release-3.23'Brad King2022-04-290-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge topic 'doc-cmake.org-tutorial-archive' into release-3.23Brad King2022-04-295-8/+62
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4cb616fed6 Tutorial: Provide a source archive when published on cmake.org 37fb70591e Utilities/Sphinx: Add variables listing pre-sphinx commands eb7d913a21 Utilities/Sphinx: Clarify names of variables listing post-sphinx commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7215
* | | | | | | | Merge topic 'doc-cmake.org-tutorial-archive'Brad King2022-04-295-8/+62
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4cb616fed6 Tutorial: Provide a source archive when published on cmake.org 37fb70591e Utilities/Sphinx: Add variables listing pre-sphinx commands eb7d913a21 Utilities/Sphinx: Clarify names of variables listing post-sphinx commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7215
| * | | | | | | Tutorial: Provide a source archive when published on cmake.orgBrad King2022-04-285-2/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide readers following the tutorial on `cmake.org` a direct link to download the tutorial's source examples. Previously readers had to fetch the CMake source tree separately and look for the tutorial source examples inside it. Fixes: #22475
| * | | | | | | Utilities/Sphinx: Add variables listing pre-sphinx commandsBrad King2022-04-271-0/+2
| | | | | | | |
| * | | | | | | Utilities/Sphinx: Clarify names of variables listing post-sphinx commandsBrad King2022-04-271-6/+6
| |/ / / / / /
* | | | | | | CMake Nightly Date StampKitware Robot2022-04-291-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge topic 'doc-genex-REMOVE_DUPLICATES'Brad King2022-04-281-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 484b992f25 Help: Clarify which items are retained by $<REMOVE_DUPLICATES:...> Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7217
| * | | | | | Help: Clarify which items are retained by $<REMOVE_DUPLICATES:...>Craig Scott2022-04-281-1/+3
| | | | | | |
* | | | | | | Merge topic 'ghs-file-type'Brad King2022-04-282-15/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 158d6252cc GHS: Set LANGUAGE type for source files Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7209
| * | | | | | | GHS: Set LANGUAGE type for source filesFred Baksik2022-04-272-15/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gbuild project syntax for setting the language type for the file. gbuild will pick the correct compiler or tool to use. NOTE: Language names come from gbuild config files. Therefore to compile a file with the C++ compiler use "C++" not "CXX". The previous implementation was passing the C compiler a flag to compile as C++ if LANGUAGE was set to "CXX".
* | | | | | | | Merge topic 'manual-fileset-for-header-only-libraries'Brad King2022-04-281-25/+26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b25a0d512 Help/manual: Update header-only library example Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7198
| * | | | | | | | Help/manual: Update header-only library exampleMartin Duffy2022-04-271-25/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use target_sources with a named file set for the header-only library example in cmake-buildsystem7. Issue: #23400
* | | | | | | | | Merge topic 'findmpi_dont_variable_lang'Brad King2022-04-281-4/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c9c2e040aa FindMPI: Don't check for variables named the same as the languages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7208
| * | | | | | | | FindMPI: Don't check for variables named the same as the languagesRobert Maynard2022-04-261-4/+4
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to see if a language is inside `MPI_FIND_COMPONENTS` not if the variables `C`/`CXX` is set to a positive value.
* | | | | | | | Merge topic 'cuda-arch-verify'Brad King2022-04-285-162/+32
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c267ed205a CUDA: Defer architecture testing to the compiler testing step Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robertjmaynard@gmail.com> Acked-by: Raul Tambre <raul@tambre.ee> Merge-request: !7202
| * | | | | | | | CUDA: Defer architecture testing to the compiler testing stepBrad King2022-04-255-162/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Verifying the architectures during compiler identification is redundant, and requires a lot more up-front information than we should need. It also causes unsupported architectures to break the compiler id and version detection, so the resulting output from CMake does not report the compiler version, which is useful information to know why the specified architectures are not supported. The "detecting compiler ABI info" and "check for working compiler" steps already pass `CMAKE_CUDA_ARCHITECTURES` into their test projects. Therefore we can just drop the earlier architecture testing. Bad architectures will be reported as a not-working compiler, and the output will include the compiler's error message. This reverts the approach from: * commit 19cc5bc296 (CUDA: Throw error if user-specified architectures don't work, 2020-05-26, v3.18.0-rc1~79^2) * commit 650c1029a0 (CUDA: Detect non-working user-specified architectures on NVCC, 2020-05-28, v3.18.0-rc1~51^2) * commit 01428c5560 (CUDA: Fail fast if CMAKE_CUDA_ARCHITECTURES doesn't work during detection, 2020-08-29, v3.19.0-rc1~241^2). Their goal was in part to avoid waiting until the test for working compiler to detect unsupported architectures. However, experience has shown that failing earlier is more trouble than it's worth. Fixes: #23161 Issue: #20756