mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 13:20:47 -06:00
Code Issues Packages Projects Releases Wiki Activity
65,333 Commits 2 Branches 385 Tags
beecda4dddc00c6ebe3f03818cee38d09c9c2cb4
Commit Graph

65333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
beecda4ddd Utilities/Release: Replace tabs with spaces in WiX input files 2024-03-11 11:59:17 -04:00
Brad King
0379196c22 Merge branch 'release-3.29' 2024-03-11 10:18:50 -04:00
Brad King
89e99cca63 Merge topic 'ctest-j-default' 
5de1e21659 ctest: Allow passing -j without value to choose a contextual default
bbcbcff7d9 cmCTestMultiProcessHandler: Modernize member initialization
7457b474a1 Tests: Remove unnecessary parallel suppression from CTestCoverageCollectGCOV
ae69801d96 Tests: Convert CTestTestSkipReturnCode to RunCMake.ctest_test case
30dda49416 Tests: Convert CTestTestSerialOrder to RunCMake.ctest_test case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !9315
 2024-03-11 10:18:50 -04:00
Brad King
04d8bc6bb9 Merge topic 'ctest-j-default' into release-3.29 
5de1e21659 ctest: Allow passing -j without value to choose a contextual default
bbcbcff7d9 cmCTestMultiProcessHandler: Modernize member initialization
7457b474a1 Tests: Remove unnecessary parallel suppression from CTestCoverageCollectGCOV
ae69801d96 Tests: Convert CTestTestSkipReturnCode to RunCMake.ctest_test case
30dda49416 Tests: Convert CTestTestSerialOrder to RunCMake.ctest_test case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !9315
 2024-03-11 10:18:49 -04:00
Brad King
91feb31577 Merge branch 'release-3.29' 2024-03-11 10:17:00 -04:00
Brad King
4905335776 Merge topic 'ctest-tests-from-file' 
170ec48601 Help: Improve ctest tests-from-file documentation wording and wrapping
1a4837641e ctest: Remove unnecessary and ambiguous tests-from-file comment syntax
d52c66bfb3 ctest: Honor tests-from-file options with empty input
8673264e25 Tests: Make ctest tests-from-file expected output more precise

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9322
 2024-03-11 10:17:00 -04:00
Brad King
da334e2db9 Merge topic 'ctest-tests-from-file' into release-3.29 
170ec48601 Help: Improve ctest tests-from-file documentation wording and wrapping
1a4837641e ctest: Remove unnecessary and ambiguous tests-from-file comment syntax
d52c66bfb3 ctest: Honor tests-from-file options with empty input
8673264e25 Tests: Make ctest tests-from-file expected output more precise

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9322
 2024-03-11 10:16:59 -04:00
Brad King
b27df13417 Merge branch 'release-3.29' 2024-03-11 10:15:17 -04:00
Brad King
6135fa4486 Merge topic 'llvm-objdump' 
c51f84b96a GET_RUNTIME_DEPENDENCIES: Allow more whitespace before objdump's "DLL Name:"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9325
 2024-03-11 10:15:17 -04:00
Brad King
d914c76d63 Merge topic 'llvm-objdump' into release-3.29 
c51f84b96a GET_RUNTIME_DEPENDENCIES: Allow more whitespace before objdump's "DLL Name:"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9325
 2024-03-11 10:15:16 -04:00
Brad King
81f6c0c1ce Merge branch 'release-3.29' 2024-03-11 10:10:57 -04:00
Brad King
f968d21e95 Merge topic 'marmasm-language' 
c34ef6c922 ASM_MARMASM: Remove broken partial support for preprocessor defines

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9326
 2024-03-11 10:10:57 -04:00
Brad King
a22245a97f Merge topic 'marmasm-language' into release-3.29 
c34ef6c922 ASM_MARMASM: Remove broken partial support for preprocessor defines

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9326
 2024-03-11 10:10:55 -04:00
Brad King
836d6a960d Merge topic 'FindCUDA-cross-compiling' 
6e8f64950b FindCUDA: Cache CUDA_TOOLKIT_ROOT_DIR when cross-compiling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9323
 2024-03-11 10:09:27 -04:00
Kitware Robot
2d61db8bf3 CMake Nightly Date Stamp 2024-03-11 00:02:41 -04:00
Brad King
5de1e21659 ctest: Allow passing -j without value to choose a contextual default 
Under job server integration, added by commit 80fe56c481 (ctest: Add
support for running under a make job server on POSIX systems,
2023-11-15, v3.29.0-rc1~324^2), use a very high default so that
parallelism is effectively limited only by available job server tokens.

Otherwise, choose a default limit based on the number of processors.

Also allow passing `0` to specify unbounded parallelism.

Fixes: #25739
 2024-03-10 11:41:39 -04:00
Alexander Neumann
c34ef6c922 ASM_MARMASM: Remove broken partial support for preprocessor defines 
Avoid passing unsupported options to the assembler.

In commit 3166547cf6 (ASM_MARMASM: Add support for Microsoft ARM
assembler language, 2022-10-14, v3.26.0-rc1~383^2) we copied the
assembler command line from `CMakeASM_MASMInformation`, but the
`marmasm` tool does not accept `-D` command-line options.

Issue: #24317
 2024-03-10 11:20:20 -04:00
Adrian Pop
c51f84b96a GET_RUNTIME_DEPENDENCIES: Allow more whitespace before objdump's "DLL Name:" 
LLVM's `llvm-objdump` has spaces before "DLL Name:" instead of tabs.
 2024-03-10 11:03:21 -04:00
Jinzhe Zeng
6e8f64950b FindCUDA: Cache CUDA_TOOLKIT_ROOT_DIR when cross-compiling 
Previously we cached `CUDA_TOOLKIT_ROOT_DIR` when building for the host,
but not when cross-compiling.  Make it consistent.
 2024-03-10 10:55:32 -04:00
Brad King
bbcbcff7d9 cmCTestMultiProcessHandler: Modernize member initialization 2024-03-10 10:27:05 -04:00
Brad King
7457b474a1 Tests: Remove unnecessary parallel suppression from CTestCoverageCollectGCOV 
This hasn't been necessary since commit ab7eda2591 (Tests: Remove
unnecessary pass regex on CTestCoverageCollectGCOV, 2020-04-29,
v3.18.0-rc1~239^2~2).
 2024-03-10 10:27:02 -04:00
Brad King
ae69801d96 Tests: Convert CTestTestSkipReturnCode to RunCMake.ctest_test case 2024-03-10 10:26:14 -04:00
Brad King
30dda49416 Tests: Convert CTestTestSerialOrder to RunCMake.ctest_test case 2024-03-10 10:24:50 -04:00
Brad King
60889d4ab3 Merge topic 'update-kwsys' 
fb84b58348 Merge branch 'upstream-KWSys' into update-kwsys
1edebc3f99 KWSys 2024-03-08 (bc0706e7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9321
 2024-03-10 08:32:21 -04:00
Brad King
2b58d8eb8e Merge topic 'zstd-disable-asm' 
4d3331c63c cmzstd: Explicitly disable ASM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !9319
 2024-03-10 08:29:00 -04:00
Brad King
b61eb62502 Merge topic 'list-index-type' 
e563201f9e cmList: Use ptrdiff_t for index_type

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9320
 2024-03-10 08:27:18 -04:00
Kitware Robot
5049f8c01e CMake Nightly Date Stamp 2024-03-10 00:01:09 -05:00
Kitware Robot
168672581d CMake Nightly Date Stamp 2024-03-09 00:01:37 -05:00
Brad King
170ec48601 Help: Improve ctest tests-from-file documentation wording and wrapping 2024-03-08 16:26:12 -05:00
Brad King
1a4837641e ctest: Remove unnecessary and ambiguous tests-from-file comment syntax 
Test names can contain `#`.  Since we ignore lines that do not match any
test names anyway, "commenting" can still work without explicit syntax.
Also drop whitespace trimming for similar reasons.

Fixes: #25741
 2024-03-08 16:25:33 -05:00
Brad King
d52c66bfb3 ctest: Honor tests-from-file options with empty input 
If the `--tests-from-file` input file is empty, no tests should run.
 2024-03-08 16:06:35 -05:00
Brad King
8673264e25 Tests: Make ctest tests-from-file expected output more precise 2024-03-08 16:03:48 -05:00
Kyle Edwards
4d3331c63c cmzstd: Explicitly disable ASM 
Our vendored zstd does not include the assembly language file from
upstream (huf_decompress_amd64.S), so it's fine to completely disable
assembly language.

Fixes: #25744
 2024-03-08 14:35:49 -05:00
Alex Richardson
e563201f9e cmList: Use ptrdiff_t for index_type 
In commit 87fe031a07 (cmList class: various enhancements, 2023-04-26,
v3.27.0-rc1~142^2~1) this changed from `int` to `intptr_t`, but on some
systems (e.g. CHERI-enabled Arm or RISC-V), `intptr_t` is larger than 64
bits and using it for `index_type` here incurs an unnecessary
performance penalty.  Additionally, using `intptr_t` here results in an
ambiguous overload while calling `cmStrCat` with `intptr_t`: `error:
conversion from '__intcap' to 'const cmAlphaNum' is ambiguous`.

Instead of adding `intptr_t` overloads for `cmAlphaNum` for CHERI
systems, we can change the type to `ptrdiff_t` (which will be the same
as `intptr_t` on all other systems) and avoid carrying diffs that only
compile with a CHERI enabled compiler.
 2024-03-08 09:49:03 -05:00
Brad King
0530eca631 Merge topic 'gtest-json-test-def-source' 
06860d5c12 ctest: Show custom test properties in --show-only=json-v1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9305
 2024-03-08 09:35:26 -05:00
Brad King
5b63ffe4cb Merge branch 'release-3.29' 2024-03-08 09:33:36 -05:00
Brad King
6deb6d51e7 Merge branch 'release-3.28' 2024-03-08 09:33:30 -05:00
Brad King
5c3512333c Merge branch 'release-3.28' into release-3.29 2024-03-08 09:33:24 -05:00
Brad King
b0bb1eed12 Merge branch 'release-3.29' 2024-03-08 09:32:37 -05:00
Brad King
e6d015fa77 Merge topic 'cxxmodules-target-objects' 
4ddf0453d5 Tests/CXXModules: add a test using `TARGET_OBJECTS` from modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9316
 2024-03-08 09:32:37 -05:00
Brad King
74d3765c2d Merge topic 'cxxmodules-target-objects' into release-3.29 
4ddf0453d5 Tests/CXXModules: add a test using `TARGET_OBJECTS` from modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9316
 2024-03-08 09:32:36 -05:00
Brad King
9bfb972c25 Merge topic 'cxxmodules-target-objects' into release-3.28 
4ddf0453d5 Tests/CXXModules: add a test using `TARGET_OBJECTS` from modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9316
 2024-03-08 09:32:01 -05:00
Brad King
24c41acbe9 Merge branch 'release-3.29' 2024-03-08 09:30:13 -05:00
Brad King
5910da32b9 Merge topic 'doc-https' 
53a542936e Help: Convert http URLs to https

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9313
 2024-03-08 09:30:13 -05:00
Brad King
23e7c9a42a Merge topic 'doc-https' into release-3.29 
53a542936e Help: Convert http URLs to https

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9313
 2024-03-08 09:30:12 -05:00
Brad King
bc6870d7bb Merge branch 'release-3.29' 2024-03-08 09:28:46 -05:00
Brad King
35038b65f9 Merge topic 'ctest-tests-from-file' 
ca0a9def2e ctest: Exit with failure when tests-from-file input is missing
60433fc6e8 Tests: Generalize ctest tests-from-file test cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9317
 2024-03-08 09:28:46 -05:00
Brad King
d68cf1553d Merge topic 'ctest-tests-from-file' into release-3.29 
ca0a9def2e ctest: Exit with failure when tests-from-file input is missing
60433fc6e8 Tests: Generalize ctest tests-from-file test cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9317
 2024-03-08 09:28:44 -05:00
Brad King
edc936336e Merge topic 'CUDAToolkit_nvfatbin' 
d420ee6b43 FindCUDAToolkit: Add support for nvfatbin added in 12.4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9311
 2024-03-08 09:26:27 -05:00
Brad King
fb84b58348 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2024-03-08 (bc0706e7)
 2024-03-08 09:19:07 -05:00