mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-07 06:40:16 -05:00
Code Issues Packages Projects Releases Wiki Activity
65,311 Commits 2 Branches 401 Tags
f968d21e956698d7bc8fc6b81a35536df3eb05af
Commit Graph

65311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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
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 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
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
KWSys Upstream 1edebc3f99 KWSys 2024-03-08 (bc0706e7) 
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit bc0706e73e38c043e14223621a6329ed1038095e (master).

Upstream Shortlog
-----------------

Brad King (1):
      3c922475 Convert http URLs to https
 2024-03-08 09:19:07 -05:00
Kitware Robot aac1597ebb CMake Nightly Date Stamp 2024-03-08 00:01:16 -05:00
scivision 53a542936e Help: Convert http URLs to https 2024-03-07 09:42:45 -05:00
Kitware Robot 26c414457b CMake Nightly Date Stamp 2024-03-07 00:01:24 -05:00
Brad King ca0a9def2e ctest: Exit with failure when tests-from-file input is missing 
If the options added by

* commit 022f20f663 (ctest: add command line option to run the tests listed
                     in a given file, 2023-11-29, v3.29.0-rc1~66^2~2)
* commit dbacc1d5a8 (ctest: add command line option to exclude tests listed
                     in a given file, 2023-11-30, v3.29.0-rc1~66^2~1)
* commit 701029726f (ctest_test: add options INCLUDE_FROM_FILE and
                     EXCLUDE_FROM_FILE, 2023-12-03, v3.29.0-rc1~66^2)

are given a missing file, fail instead of ignoring it.

Fixes: #25740
 2024-03-06 16:14:04 -05:00
Brad King 60433fc6e8 Tests: Generalize ctest tests-from-file test cases 2024-03-06 13:34:10 -05:00
Ben Boeckel 4ddf0453d5 Tests/CXXModules: add a test using TARGET_OBJECTS from modules 
See: #25732
 2024-03-06 12:34:46 -05:00
Daniel Sim 06860d5c12 ctest: Show custom test properties in --show-only=json-v1 2024-03-06 15:06:20 +00:00
Brad King 75c195fa67 Merge branch 'release-3.29' 2024-03-06 09:00:20 -05:00
Brad King e5f08e06d3 Merge topic 'FindRuby-3.3' 
c2bf3e46fa FindRuby: Fix finding Ruby 3.1+ on Windows
867550db43 FindRuby: Add support for 3.3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9309
 2024-03-06 09:00:20 -05:00
Brad King dd8e84a8fa Merge topic 'FindRuby-3.3' into release-3.29 
c2bf3e46fa FindRuby: Fix finding Ruby 3.1+ on Windows
867550db43 FindRuby: Add support for 3.3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9309
 2024-03-06 09:00:19 -05:00
Kitware Robot 1f2ac0c18e CMake Nightly Date Stamp 2024-03-06 00:01:13 -05:00
Robert Maynard d420ee6b43 FindCUDAToolkit: Add support for nvfatbin added in 12.4 2024-03-05 16:43:09 -05:00
Charlie Savage c2bf3e46fa FindRuby: Fix finding Ruby 3.1+ on Windows 
It switched to the UCRT C runtime.
 2024-03-05 08:47:59 -05:00
Charlie Savage 867550db43 FindRuby: Add support for 3.3 2024-03-05 08:46:29 -05:00
Brad King ac411fc8b3 Merge topic 'nasm' 
7cf45c9e6a ASM_NASM: Improve support for standalone usage
47bc42b5ac ci: Add nasm assembler to Debian and Fedora base images

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9306
 2024-03-05 08:21:22 -05:00
Brad King 9cc874a4e8 Merge topic '2024-bootstrap-pkgconfig-ldflags' 
da5de7f9f3 bootstrap: Allow --boostrap-system-* libraries custom prefixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9307
 2024-03-05 08:20:23 -05:00
Kitware Robot d40dd20874 CMake Nightly Date Stamp 2024-03-05 00:01:14 -05:00
Brad King 30d8bcd35c Merge branch 'release-3.29' 2024-03-04 14:38:41 -05:00
Brad King 965acca98c CMake 3.29.0-rc3 v3.29.0-rc3 2024-03-04 13:58:26 -05:00
Vito Gamberini 7cf45c9e6a ASM_NASM: Improve support for standalone usage 
* Add tests for standalone NASM usage

* Change generic ASM_NASM executable linker to <CMAKE_LINKER>

* Use CMAKE_SYSTEM_PROCESSOR to determine output format when used
  without a C/CXX compiler
 2024-03-04 13:09:58 -05:00
Brad King 47bc42b5ac ci: Add nasm assembler to Debian and Fedora base images 2024-03-04 12:12:58 -05:00