summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FindCUDAToolkit: Handle toolkits that don't provide nvptxcompilerRobert Maynard2022-11-171-1/+3
| | | | | | Some versions of the CUDA toolkit don't provide any static libraries, and therefore we need to handle that `nvptxcompiler_static` might not be found
* CMake 3.25.0v3.25.0Brad King2022-11-161-1/+1
|
* Merge topic 'qtifw-4.5' into release-3.25Brad King2022-11-161-0/+2
|\ | | | | | | | | | | | | 351239b776 CPack/IFW: Add support for QtIFW 4.5 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7920
| * CPack/IFW: Add support for QtIFW 4.5Erlend E. Aasland2022-11-151-0/+2
| | | | | | | | Fixes: #24164
* | Merge topic 'cmp0141-pch-reuse' into release-3.25Brad King2022-11-163-2/+11
|\ \ | |/ |/| | | | | | | | | 94164ea55e CMP0141: Fix PCH REUSE_FROM when MSVC_DEBUG_INFORMATION_FORMAT is empty Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7914
| * CMP0141: Fix PCH REUSE_FROM when MSVC_DEBUG_INFORMATION_FORMAT is emptyBrad King2022-11-153-2/+11
|/ | | | | | | | | | | | Under the policy's NEW behavior, `[CMAKE_]MSVC_DEBUG_INFORMATION_FORMAT` may be explicitly set to an empty string to tell CMake not to add any flags for this abstraction. In this case, fall back to checking the language-wide flags as we do in the OLD behavior. This revises commit 183b9a9eca (CMP0141: Fix PCH REUSE_FROM under policy NEW behavior, 2022-10-31, v3.25.0-rc3~4^2). Issue: #24106
* Merge branch 'release-3.24' into release-3.25Brad King2022-11-140-0/+0
|\
| * Merge branch 'release-3.23' into release-3.24Brad King2022-11-140-0/+0
| |\
| | * Merge branch 'compile-msvc-14.34-c++20' into release-3.23Brad King2022-11-141-1/+2
| | |\ | | | | | | | | | | | | Merge-request: !7910
| * | \ Merge branch 'compile-msvc-14.34-c++20' into release-3.24Brad King2022-11-141-1/+2
| |\ \ \ | | | |/ | | |/| | | | | Merge-request: !7910
* | | | Merge branch 'compile-msvc-14.34-c++20' into release-3.25Brad King2022-11-140-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | Merge-request: !7910
| * | | cmGlobalVisualStudioGenerator: Fix compiling as C++20 in VS 2022Werner, Joerg2022-11-141-1/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Adding missing narrow string conversion. This backports commit f3c918ef1b (cmGlobalVisualStudioGenerator: Fix compiling as C++20 in VS 2022, 2022-10-20, v3.25.0-rc3~31^2) to the CMake 3.23 and 3.24 branches. Fixes: #24162
* | | Merge topic 'msvc-19.34-cpp-modules' into release-3.25Brad King2022-11-146-33/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0e9782b336 msvc: bless MSVC 19.34 support for C++ modules as experimental Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7745
| * | | msvc: bless MSVC 19.34 support for C++ modules as experimentalBen Boeckel2022-11-116-33/+19
| | | | | | | | | | | | | | | | Visual Studio 17.4 now contains official support for what CMake needs.
* | | | 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
| |/ / /