summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'iar-asm-archid' into release-3.25Brad King2022-11-141-4/+3
|\ | | | | | | | | | | | | f9ff6ab2d1 IAR: Fix ASM compiler architecture detection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7903
| * IAR: Fix ASM compiler architecture detectionFelipe Torrezan2022-11-111-4/+3
|/ | | | | | | Narrow the regex to match the actual supported architectures, avoiding mismatched detection. Fixes: #24145
* Merge topic 'ci-msvc-14.34' into release-3.25Brad King2022-11-112-46/+25
|\ | | | | | | | | | | | | | | bd5176abac gitlab-ci: Update Windows packaging builds to MSVC 14.34 toolset ccdff280f4 gitlab-ci: Update Windows non-packaging builds to MSVC 14.34 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7891
| * gitlab-ci: Update Windows packaging builds to MSVC 14.34 toolsetBrad King2022-11-102-41/+20
| | | | | | | | | | | | | | | | | | | | Problems with `cmake-gui` when compiled with the MSVC 14.33 toolset, that did not occur with the MSVC 14.32 toolset, no longer occur with the MSVC 14.34 toolset. Revert commit cb8b27a901 (gitlab-ci: Use separate MSVC toolset specification for packaging jobs, 2022-08-18, v3.24.2~24^2~1) and update the remaining toolset version references. Fixes: #23859
| * gitlab-ci: Update Windows non-packaging builds to MSVC 14.34 toolsetBrad King2022-11-101-5/+5
| |
* | Merge topic 'ci-clang15-windows' into release-3.25Brad King2022-11-1112-49/+46
|\ \ | |/ | | | | | | | | | | | | | | | | | | 46b2849550 ci: Update LLVM/Clang to 15.0 in nightly CI jobs on Windows 3eb94e4d51 ci: Simplify LLVM/Clang CI job specs on Windows 8ba5835c8d ci: Factor out helper to load clang into environment on Windows bf2e4a2e85 ci: Factor out helper to load ninja into environment on Windows 93ff726114 Tests: Fix TryCompile bad source case for clang-cl 15 on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7897
| * ci: Update LLVM/Clang to 15.0 in nightly CI jobs on WindowsBrad King2022-11-102-13/+17
| |
| * ci: Simplify LLVM/Clang CI job specs on WindowsBrad King2022-11-104-15/+7
| | | | | | | | | | Move environment setup to job-specific scripts so we can reuse the common `.cmake_test_windows_external` code path.
| * ci: Factor out helper to load clang into environment on WindowsBrad King2022-11-105-13/+16
| |
| * ci: Factor out helper to load ninja into environment on WindowsBrad King2022-11-103-10/+8
| |
| * Tests: Fix TryCompile bad source case for clang-cl 15 on WindowsBrad King2022-11-101-1/+1
| | | | | | | | | | | | When `pass.c bad#source.c` passes through `nmake`, the compiler gets `pass.c bad`. The clang-cl 15 compiler now fails on `bad` with an error that we did not previously match. Update our regex.
* | Merge topic 'fix-cxx20-detection' into release-3.25Brad King2022-11-111-5/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 5e7c8f44ac Ninja: Restore support for compilers not defining a C++ standard level Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Acked-by: Jaeden Amero <kitware@patater.com> Acked-by: Martin Kojtal <martin.kojtal@arm.com> Merge-request: !7896
| * | Ninja: Restore support for compilers not defining a C++ standard levelLingkai Dong2022-11-101-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 386465bf83 (cmTarget: add support for C++ module fileset types, 2022-04-08, v3.25.0-rc1~624^2~7), the Ninja generator checks for C++20 support using logic that requires `CMAKE_<LANG>_STANDARD_DEFAULT` to be non-empty. On some compilers, such as ARMClang, CMake does not automatically detect and set default language standards, thus causing `HaveStandardAvailable` to raise an internal error. To fix this issue, if `CMAKE_CXX_STANDARD_DEFAULT` is empty, assume all standards to be supported instead of calling `HaveStandardAvailable`. This is consistent with how `CompileFeaturesNode::Evaluate` handles this case. Fixes: #24146
* | | Merge branch 'release-3.24' into release-3.25Brad King2022-11-110-0/+0
|\ \ \
| * \ \ Merge branch 'expat-c-no-extensions' into release-3.24Brad King2022-11-101-0/+6
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !7899
* | \ \ \ Merge topic 'expat-c-no-extensions' into release-3.25Brad King2022-11-111-0/+6
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | | | | | | | | | | | | | | 019af62294 expat: Activate POSIX APIs even without compiler extensions Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7899
| * | | expat: Activate POSIX APIs even without compiler extensionsRaul Tambre2022-11-101-0/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compile with the preprocessor definitions necessary for the `arc4random` family so it's available even when compiler extensions are not enabled. Similar things are done in cmbzip2, cmcurl, cmlibarchive, cmliblizma and cmlibuv. This issue surfaced on a nightly bot after glibc 2.36 added arc4random functions. cmlibarchive defines the necessary macro, but also relies on `HAVE_ARC4RANDOM_BUF`. cmlibarchive's check with the necessary macro defined was skipped due to cmexpat running the same check before, but without the macros, and it being cached. This extends commit c7c3e39e4f (Utilities: Activate POSIX APIs even without compiler extensions, 2022-06-02, v3.24.0-rc1~34^2) to cover our build of expat too. Issue: #20454
* | | Merge topic 'cmake-gui-restore-version-info' into release-3.25Brad King2022-11-101-3/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec76a9c22f cmake-gui: Restore embedded version information in Windows binary Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7895
| * | | cmake-gui: Restore embedded version information in Windows binaryBrad King2022-11-091-3/+8
| | |/ | |/| | | | | | | | | | | | | Refactoring in commit 89a1e1c1be (Build: Link w/ `OBJECT` library is OK since 3.12, 2022-08-21, v3.25.0-rc1~97^2~19) dropped the `.res` object containing this information from the `cmake-gui` link line. Restore it.
* | | Merge topic 'curl-windows-no-tls1.3' into release-3.25Brad King2022-11-101-0/+7
|\ \ \ | |/ / |/| | | | | | | | | | | | | | c0a4536cec curl: Disable schannel TLS 1.3 support on Windows 11 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7894
| * | curl: Disable schannel TLS 1.3 support on Windows 11Brad King2022-11-091-0/+7
|/ / | | | | | | | | | | | | | | Curl 7.85.0 introduced support for TLS 1.3 support with schannel. We've observed connection failures in some cases, so disable the support pending further investigation. Fixes: #24147
* | Merge topic 'doc-guide-link-style' into release-3.25Brad King2022-11-091-0/+11
|\ \ | | | | | | | | | | | | | | | | | | 977c38c339 Help: Render guide links as normal text instead of monospace Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7886
| * | Help: Render guide links as normal text instead of monospaceAlex Turbov2022-11-081-0/+11
| | | | | | | | | | | | | | | The guide document names are phrases, not code-like man-page names. Add CSS selectors for `:guide:` links and revert unnecessary properties.
* | | CMake 3.25.0-rc4v3.25.0-rc4Brad King2022-11-081-1/+1
|/ /
* | Merge topic 'sphinx-linkcheck' into release-3.25Brad King2022-11-0835-123/+123
|\ \ | | | | | | | | | | | | | | | | | | | | | 435b0c573c Help: Fix some redirects reported with sphinx linkcheck ac5295a9de Help: Fix broken external links found by sphinx linkcheck Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7876
| * | Help: Fix some redirects reported with sphinx linkcheckAlex Turbov2022-11-0729-109/+110
| | | | | | | | | | | | Mostly it's about replace `http:` with `https:` protocol.
| * | Help: Fix broken external links found by sphinx linkcheckAlex Turbov2022-11-077-14/+13
| | |
* | | Merge topic 'doc-block-return' into release-3.25Brad King2022-11-083-40/+78
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1046a61cfd Help: clean up and clarify block() and return() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7872
| * | | Help: clean up and clarify block() and return()Craig Scott2022-11-073-40/+78
| |/ /
* | | Merge topic 'block-var-scope' into release-3.25Brad King2022-11-087-18/+51
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 96ddcbee60 cmState: Clarify name of member tracking the active scope in a directory cb53d9309e block: Fix variable scope protection from modification by subdirectories Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7885
| * | | cmState: Clarify name of member tracking the active scope in a directoryBrad King2022-11-073-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `DirectoryEnd` member added by commit 52dbe654de (cmState: Record the end position of each directory., 2015-08-01, v3.4.0-rc1~251^2~1) actually tracks the current top-most scope in a directory's stack. This is evidenced by the use case in commit 3f4e5e8c3d (cmState: Return end snapshot for GetBuildsystemDirectoryParent., 2015-09-01, v3.4.0-rc1~100^2~1). Rename the member to `CurrentScope` to clarify this role.
| * | | block: Fix variable scope protection from modification by subdirectoriesBrad King2022-11-075-2/+35
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `cmStateSnapshot::RaiseScope` raises a variable in to a parent directory scope, it uses `GetBuildsystemDirectoryParent` to find the current top-most scope on the directory's stack. Since commit 3f4e5e8c3d (cmState: Return end snapshot for GetBuildsystemDirectoryParent., 2015-09-01, v3.4.0-rc1~100^2~1), that depends on the `DirectoryEnd` field in the directory's state. However, when variable-only scopes were added by commit 6954c8936f (cmState: Add a VariableScope snapshot type., 2015-08-01, v3.4.0-rc1~179^2~1), we neglected to account for the addition of that field by commit 52dbe654de (cmState: Record the end position of each directory., 2015-08-01, v3.4.0-rc1~251^2~1). Prior to commit 44a2f3f332 (Add new flow-control commands for variables and policies scopes management, 2022-08-05, v3.25.0-rc1~257^2) this problem went unnoticed because there was no way to have a variable scope at the top of a directory's stack while processing a subdirectory. Now the `block()/endblock()` commands enable the behavior, so fix tracking of a variable scope as the top-most scope in a directory. Fixes: #24138
* | | Merge topic 'doc-msvc-abi' into release-3.25Brad King2022-11-082-4/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 128c414a56 Help: Clarify compilers affected by MSVC ABI abstractions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7881
| * | | Help: Clarify compilers affected by MSVC ABI abstractionsBrad King2022-11-072-4/+6
| |/ / | | | | | | | | | | | | | | | | | | The `MSVC_DEBUG_INFORMATION_FORMAT` and `MSVC_RUNTIME_LIBRARY` abstractions apply to any compilers targeting the MSVC ABI. Fixes: #24137
* | | Merge topic 'FindOpenSSL-mingw-lib64' into release-3.25Brad King2022-11-081-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ed24414eee FindOpenSSL: Search "lib64" for mingw 64-bit installs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7875
| * | | FindOpenSSL: Search "lib64" for mingw 64-bit installsklytje2022-11-071-0/+2
| |/ /
* | | Merge topic 'tasking_update_toolset_doc' into release-3.25Brad King2022-11-081-4/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | beade1cb42 Tasking: Update CMAKE_TASKING_TOOLSET documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7880
| * | | Tasking: Update CMAKE_TASKING_TOOLSET documentationChristoph Seitz2022-11-071-4/+7
| |/ / | | | | | | | | | | | | | | | | | | Clarify the relationship between the compiler version and toolset/architecture. Fixes: #24117
* | | Merge topic 'tasking_remove_system_processor' into release-3.25Brad King2022-11-081-32/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0a1d558971 Tasking: Remove CMAKE_SYSTEM_PROCESSOR support per CMP0123 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7879
| * | | Tasking: Remove CMAKE_SYSTEM_PROCESSOR support per CMP0123Christoph Seitz2022-11-071-32/+0
| |/ / | | | | | | | | | | | | | | | | | | Architecture specific compile options should be set through toolchain files. Fixes: #24115
* | | Merge topic 'doc-find-validator' into release-3.25Craig Scott2022-11-081-9/+14
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 7e1a4567fb Help: Make VALIDATOR wording clearer and more precise Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7874
| * | Help: Make VALIDATOR wording clearer and more preciseCraig Scott2022-11-071-9/+14
|/ /
* | Merge topic 'tasking-pic' into release-3.25Brad King2022-11-041-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | 7e612977b9 Tasking: Fix PIC option for Tasking Toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Christoph Seitz <christoph.seitz@posteo.de> Merge-request: !7862
| * | Tasking: Fix PIC option for Tasking ToolsetGordon Jess2022-11-031-1/+1
| | | | | | | | | | | | Fixes: #24114
* | | Merge topic 'vs-default-toolset' into release-3.25Brad King2022-11-041-18/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c50df859c5 VS: Restore support for two-part default toolset version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7864
| * | | VS: Restore support for two-part default toolset versionBrad King2022-11-031-18/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit f972e4fd3a (cmVSGenerator: Add support for two-part toolset versions for Visual Studio, 2022-09-01, v3.25.0-rc1~180^2), if a two-part toolset version is requested, we fail early if globbing finds no auxiliary toolsets with that version. This broke our existing support for detecting when the default toolset matches the two-part version requested. Fix the logic to ignore the two-part globbing results if they are empty so we fall through to checking the default version. Fixes: #24107
* | | | Merge branch 'release-3.24' into release-3.25Brad King2022-11-040-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'ci-xcode-14.1' into release-3.24Brad King2022-11-0310-29/+37
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !7863
* | \ \ \ Merge topic 'ci-xcode-14.1' into release-3.25Brad King2022-11-041-6/+6
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | | | | | | | | | | | | | | | | | | 0d3d687067 gitlab-ci: update macOS jobs to use Xcode 14.1 9684a589ca Source: Replace uses of sprintf with safer snprintf in CMake 3.24 branch eea23d21a3 Source: Tell Git not to check whitespace in third-party curses form code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7863
| * | | gitlab-ci: update macOS jobs to use Xcode 14.1Brad King2022-11-031-6/+6
| | | |
generated by cgit v0.12 at 2025-09-13 17:15:40 (GMT)