summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-3.24' into release-3.25Brad King2023-01-130-0/+0
|\
| * Merge branch 'release-3.23' into release-3.24Brad King2023-01-120-0/+0
| |\
| | * Merge branch 'backport-IntelLLVM-no-icpx-on-Windows' into release-3.23Brad King2023-01-121-1/+7
| | |\ | | | | | | | | | | | | Merge-request: !8041
| * | \ Merge branch 'backport-IntelLLVM-no-icpx-on-Windows' into release-3.24Brad King2023-01-121-1/+7
| |\ \ \ | | | |/ | | |/| | | | | Merge-request: !8041
* | | | Merge topic 'IntelLLVM-no-icpx-on-Windows' into release-3.25Brad King2023-01-132-3/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 870d89627f Help: Clarify compiler id distinction between Intel Classic and IntelLLVM ea4cfb3b53 Merge branch 'backport-IntelLLVM-no-icpx-on-Windows' 8834e4d6a5 IntelLLVM: Avoid finding not-yet-supported icpx on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8041
| * | | | Help: Clarify compiler id distinction between Intel Classic and IntelLLVMMichael Hirsch2023-01-121-2/+3
| | | | |
| * | | | Merge branch 'backport-IntelLLVM-no-icpx-on-Windows'Brad King2023-01-121-1/+7
| |\ \ \ \ |/ / / / / | | | _ / | | | /
| * | | IntelLLVM: Avoid finding not-yet-supported icpx on WindowsMichael Hirsch2023-01-121-1/+7
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Intel oneAPI 2023.0 added the `icpx` compiler front-end on Windows. It uses a GNU-like command-line, and is not yet supported by CMake. Avoid finding `icpx` as the CXX compiler on Windows until support is added. Fixes: #24266 Issue: #24314
* | | Merge topic 'FindBoost-1.81' into release-3.25Brad King2023-01-121-2/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a97032c4e7 FindBoost: Add Boost 1.81 support Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Christoph Grüninger <foss@grueninger.de> Merge-request: !8056
| * | | FindBoost: Add Boost 1.81 supportleha-bot2023-01-111-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the list of known versions. There is a new header-only library, Boost.URL. It has no dependencies and has a core header `<boost/url.hpp>`. Run the command cmake -DBOOST_DIR=/path/to/boost_1_81_0 \ -P Utilities/Scripts/BoostScanDeps.cmake to extract dependencies from the 1.81.0 source tree. They are the same as 1.80's dependencies, so just update the version check for warning about newer versions.
* | | | Merge branch 'release-3.24' into release-3.25Brad King2023-01-120-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'fix-cmzlib-crc32-fn-mangling' into release-3.24Brad King2023-01-121-2/+1
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !8049
* | \ \ \ Merge topic 'fix-cmzlib-crc32-fn-mangling' into release-3.25Brad King2023-01-121-2/+1
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | | | | | | | | | | 7d92e363a2 zlib: Fix typo in mangling the crc32() function Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8049
| * | | zlib: Fix typo in mangling the crc32() functionleha-bot2023-01-111-2/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | Fix the mangling of `crc32` by commit 29c578c8fb (zlib: Mangle symbols to avoid conflict with external transitive dependencies, 2022-06-10, v3.24.0-rc1~7^2). Fixes: #24281
* | | Merge branch 'release-3.24' into release-3.25Brad King2023-01-110-0/+0
|\ \ \ | |/ /
| * | Merge branch 'test-git-local-defaultBranch' into release-3.24Brad King2023-01-111-1/+1
| |\ \ | | | | | | | | | | | | Merge-request: !8060
* | \ \ Merge branch 'test-git-local-defaultBranch' into release-3.25Brad King2023-01-111-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | Merge-request: !8060
| * | | Tests: Fix CTest.UpdateGIT under repo-local defaultBranch configBrad King2023-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default branch detection added by commit 26ec2e2b0c (Tests: Update CTest.UpdateGIT test for custom defaultBranch, 2020-12-02, v3.20.0-rc1~355^2) fails if the test is run inside a Git work tree whose `.git` directory configures a `defaultBranch` that is different from the global or system-wide value. Fix the detection to ignore the locally configured value so that we match the `git init` decision.
* | | | Merge topic 'doc-SYSTEM' into release-3.25Craig Scott2022-12-199-64/+82
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dfab263825 Help: Clarify and update SYSTEM-related docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8027
| * | | | Help: Clarify and update SYSTEM-related docsCraig Scott2022-12-179-64/+82
| | | | |
* | | | | Merge topic 'code-comment-typos' into release-3.25Craig Scott2022-12-192-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a817948423 Code comments: Fix trivial typos Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8030
| * | | | | Code comments: Fix trivial typosCraig Scott2022-12-172-2/+2
| |/ / / /
* | | | | Merge topic 'doc-updates' into release-3.25Marc Chevrier2022-12-181-11/+11
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 22d36aa0f8 Help: string(JSON): avoid duplicate labels Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8028
| * | | | Help: string(JSON): avoid duplicate labelsMarc Chevrier2022-12-171-11/+11
|/ / / /
* | | | Merge topic 'doc-updates' into release-3.25Craig Scott2022-12-171-6/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2ee845c0a5 Help: Add version information for SYSTEM option of add_subdirectory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8025
| * | | | Help: Add version information for SYSTEM option of add_subdirectoryMarc Chevrier2022-12-161-6/+7
| | | | |
* | | | | Merge topic 'masm-debug-format' into release-3.25Brad King2022-12-163-1/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9bd1e34ef VS: Do not enable ASM_MASM debug information unless requested 98ba122a30 ASM_MASM: Populate MSVC debug information format abstraction table Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8022
| * | | | | VS: Do not enable ASM_MASM debug information unless requestedBrad King2022-12-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSBuild enables debug information with MASM by default, but for us that is not consistent with behavior on other generators.
| * | | | | ASM_MASM: Populate MSVC debug information format abstraction tableBrad King2022-12-152-1/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 0e96a20478 (MSVC: Add abstraction for debug information format, 2022-08-25, v3.25.0-rc1~142^2~1) we overlooked populating the runtime library selection flags for the Microsoft assembler. Its compiler id is `MSVC`, so our generators expect the table to be populated. It only supports `Embedded` debug info. Use empty flags for the other formats. Without this fix, enabling the `ASM_MASM` language with policy `CMP0141` set to `NEW` causes an error due to the missing table entries. Fixes: #24249
* | | | | Merge branch 'release-3.24' into release-3.25Brad King2022-12-160-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'ci-xcode-14.2' into release-3.24Brad King2022-12-161-6/+6
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | Merge-request: !8023
* | | | | Merge topic 'ci-xcode-14.2' into release-3.25Brad King2022-12-161-6/+6
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | | | | | | | | | | 85d2ce0bfe gitlab-ci: update macOS jobs to use Xcode 14.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8023
| * | | gitlab-ci: update macOS jobs to use Xcode 14.2Brad King2022-12-151-6/+6
| |/ /
* | | Merge topic 'cuda-nvcc-cuda20' into release-3.25Brad King2022-12-142-0/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0aeeb8160c CUDA: Add support for cuda_std_20 for nvcc 12.0+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8008
| * | | CUDA: Add support for cuda_std_20 for nvcc 12.0+Robert Maynard2022-12-132-0/+18
|/ / / | | | | | | | | | CUDA 12.0 has been released with support for `-std=c++20`.
* | | Merge topic 'ccmake-aix-curses' into release-3.25Brad King2022-12-081-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | d91d9ec431 ccmake: Restore compilation with AIX curses.h Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8001
| * | | ccmake: Restore compilation with AIX curses.hBrad King2022-12-071-0/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | On AIX, including `<curses.h>` includes `<term.h>` which defines a bunch of non-prefixed, lower-case macro names. Undefine one that conflicts with our source code. Fixes: #24229
* | | Merge topic 'doc-SYSTEM' into release-3.25Brad King2022-12-073-7/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b15b9cf286 Help: Clarify SYSTEM property default for imported targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7990
| * | | Help: Clarify SYSTEM property default for imported targetsBrad King2022-12-063-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | The `SYSTEM` directory property does not affect imported targets. Fixes: #24219
* | | | Merge topic 'ci-os-arch' into release-3.25Brad King2022-12-065-47/+30
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 2bf1ce6cc3 gitlab-ci: drop unnecessary linux kernel version tag on 3.25 release branch 429574a94e gitlab-ci: replace '$os' tags with '$os-x86_64' on 3.25 release branch Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7995
| * | | gitlab-ci: drop unnecessary linux kernel version tag on 3.25 release branchBrad King2022-12-062-33/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All our CI hosts now have Linux kernel version 3.17 or higher, so we no longer need a dedicated tag. This backports commit c212c7dc8b (gitlab-ci: drop unnecessary linux kernel version tag, 2022-11-30) to the 3.25 release branch.
| * | | gitlab-ci: replace '$os' tags with '$os-x86_64' on 3.25 release branchBrad King2022-12-064-15/+15
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latter tags are now available on our CI runners to more explicitly distinguish `linux-x86_64` from `linux-aarch64` and to distinguish `{macos,windows}-x86_64` from `{macos,windows}-arm64`. This backports commit 33fe37a660 (gitlab-ci: replace '{macos,windows}' tags with '{macos,windows}-x86_64', 2022-11-30) and commit 94d82d91d5 (gitlab-ci: replace 'linux' tags with 'linux-x86_64', 2022-11-30) to the 3.25 release branch.
* | | Merge topic 'CheckSymbolExists-restore-newline' into release-3.25Brad King2022-12-051-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9273b8f421 CheckSymbolExists: Restore newline at end of test source Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Petr Nechaev <petr.nechaev@cogentembedded.com> Merge-request: !7979
| * | | CheckSymbolExists: Restore newline at end of test sourceAndrey Vostrikov2022-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit db76876db5 (Modules: Use new SOURCES_FROM_* try_compile (1/2), 2022-09-26, v3.25.0-rc1~74^2~1) accidentally dropped the final newline of the test source, which was previously provided by the input to `configure_file`. The C standard requires a newline at the end of file, so add one explicitly. Signed-off-by: Andrey Vostrikov <andrey.vostrikov@cogentembedded.com>
* | | | Merge topic 'FetchContent-SYSTEM' into release-3.25Craig Scott2022-12-051-0/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 4b85141f83 FetchContent: Don't pass SYSTEM through to sub-build Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7977
| * | | FetchContent: Don't pass SYSTEM through to sub-buildCraig Scott2022-12-021-0/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | If we don't filter out SYSTEM from the arguments we pass through to ExternalProject_Add(), it gets appended as a list item to whatever arguments precede it because ExternalProject_Add() doesn't recognize it as a keyword. Fixes: #24201
* | | Merge branch 'release-3.24' into release-3.25Brad King2022-11-300-0/+0
|\ \ \ | |/ /
| * | Merge branch 'rel-win-sign-digest' into release-3.24Brad King2022-11-301-1/+1
| |\ \ | | | | | | | | | | | | Merge-request: !7970
* | \ \ Merge topic 'rel-win-sign-digest' into release-3.25Brad King2022-11-301-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 870f30aacc Utilities/Release: Use explicit digest for Win7-compatible signature Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7970
| * | | Utilities/Release: Use explicit digest for Win7-compatible signatureBrad King2022-11-301-1/+1
| |/ / | | | | | | | | | Otherwise `signtool` warns.
generated by cgit v0.12 at 2025-09-11 14:15:43 (GMT)