Commit Graph

65278 Commits

Author SHA1 Message Date
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
Kitware Robot aac1597ebb CMake Nightly Date Stamp 2024-03-08 00:01:16 -05:00
Kitware Robot 26c414457b CMake Nightly Date Stamp 2024-03-07 00:01:24 -05: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
Brad King d42a2accf6 Merge topic 'ci-windows-no-java'
2c324f2ea2 ci: Explicitly disable Java tests on more Windows jobs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9302
2024-03-04 10:23:04 -05:00
Brad King 0719320d21 Merge branch 'release-3.29' 2024-03-04 10:21:39 -05:00
Brad King 372e25f081 Merge branch 'release-3.28' 2024-03-04 10:21:38 -05:00
Brad King 68240e7e49 Merge branch 'release-3.28' into release-3.29 2024-03-04 10:21:32 -05:00
Brad King f19c28e1be Merge branch 'release-3.29' 2024-03-04 10:20:49 -05:00
Brad King 4feab44829 Merge topic 'cxxmodules-invalid-iterator'
844f054fe0 cmImportedCxxModuleInfo: remove unused pointer field

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9303
2024-03-04 10:20:48 -05:00
Brad King 37ddb04738 Merge topic 'cxxmodules-invalid-iterator' into release-3.29
844f054fe0 cmImportedCxxModuleInfo: remove unused pointer field

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9303
2024-03-04 10:20:47 -05:00
Brad King 944f10d768 Merge topic 'cxxmodules-invalid-iterator' into release-3.28
844f054fe0 cmImportedCxxModuleInfo: remove unused pointer field

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9303
2024-03-04 10:19:34 -05:00
Alex Richardson da5de7f9f3 bootstrap: Allow --boostrap-system-* libraries custom prefixes
If pkg-config is available, we can query it for the correct -l/-L flags.
This fixes the --boostrap-libuv build for me with libuv installed into
$HOME and PKG_CONFIG_PATH set appropriately
2024-03-03 23:08:35 -08:00
Kitware Robot debf777290 CMake Nightly Date Stamp 2024-03-04 00:02:49 -05:00
Kitware Robot e1cca0cb9e CMake Nightly Date Stamp 2024-03-03 00:01:09 -05:00
Kitware Robot f3204de7b6 CMake Nightly Date Stamp 2024-03-02 00:01:20 -05:00
Ben Boeckel 844f054fe0 cmImportedCxxModuleInfo: remove unused pointer field
Also avoids usage of an invalid `importit` when module names are not
available.
2024-03-01 11:23:44 -05:00
Brad King 2c324f2ea2 ci: Explicitly disable Java tests on more Windows jobs
Extend the change from commit 840fa28d3d (ci: Explicitly disable Java
tests on Windows, 2021-12-16, v3.22.2~17^2) to cover NMake, JOM, and
Ninja Multi-Config jobs.
2024-03-01 09:06:40 -05:00
Brad King 43daf8adaa Merge branch 'release-3.29' 2024-03-01 09:01:07 -05:00
Brad King e1f74efd87 Merge branch 'release-3.28' 2024-03-01 09:01:00 -05:00
Brad King 4c0ea43c09 Merge branch 'release-3.28' into release-3.29 2024-03-01 09:00:38 -05:00
Brad King 2c72e6ebb4 Merge branch 'release-3.29' 2024-03-01 08:59:51 -05:00
Brad King eafeb52d48 Merge topic 'FindTIFF-cmake-package'
b6b2f73f36 FindTIFF: Fix name of upstream TIFF cmake package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9300
2024-03-01 08:59:51 -05:00
Brad King e80ad5809b Merge topic 'FindTIFF-cmake-package' into release-3.29
b6b2f73f36 FindTIFF: Fix name of upstream TIFF cmake package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9300
2024-03-01 08:59:50 -05:00
Brad King d16ac6f801 Merge topic 'FindTIFF-cmake-package' into release-3.28
b6b2f73f36 FindTIFF: Fix name of upstream TIFF cmake package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9300
2024-03-01 08:59:04 -05:00
Brad King 4f5322d18f Merge topic 'ExternalProject-TLS_VERSION'
2ef3bd9186 ExternalProject: Add TLS version options for https connections
f0a36b1a76 ExternalProject: Factor out helper to get NETRC options
019960a52a ExternalProject: Factor out helper to get TLS_CAINFO option
1afa6f359e ExternalProject: Factor out helper to get TLS_VERIFY option
e39c37ab29 ExternalProject: Revise wording of TLS_VERIFY documentation
fe5e6c27bd ExternalProject: Prepare for multiple git submodule config options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !9296
2024-03-01 08:58:22 -05:00
Brad King 4d0680b061 Merge topic 'ci-vs-android'
71fea8fbf5 ci: Enable VSAndroid test in VS 2022 nightly job
85b28c8f83 ci: Enable VSAndroid test in VS 2019 nightly job
f2092b02d5 Tests/VSAndroid: Update for VS 17
a0f85760ac gitlab-ci: add rules to suppress jobs in a nightly pipeline schedule

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !9301
2024-03-01 08:48:38 -05:00
Kitware Robot 2bd9ea9acb CMake Nightly Date Stamp 2024-03-01 00:01:16 -05:00
Brad King 71fea8fbf5 ci: Enable VSAndroid test in VS 2022 nightly job 2024-02-29 13:58:42 -05:00
Brad King 85b28c8f83 ci: Enable VSAndroid test in VS 2019 nightly job 2024-02-29 13:58:16 -05:00
Brad King f2092b02d5 Tests/VSAndroid: Update for VS 17 2024-02-29 11:59:05 -05:00
Brad King a0f85760ac gitlab-ci: add rules to suppress jobs in a nightly pipeline schedule 2024-02-29 11:59:05 -05:00
Brad King b6b2f73f36 FindTIFF: Fix name of upstream TIFF cmake package
Since commit 6a3059e66f (FindTIFF: bridge `tiff-config` into
FindTIFF-compatible interface, 2023-09-14, v3.28.0-rc1~87^2)
we try to find the upstream TIFF cmake package.  However, it
is called `TiffConfig.cmake`, not `tiff-config.cmake`, so we
need to match the capitalization of the package name.
2024-02-29 08:47:53 -05:00
Brad King a50982b637 Merge topic 'cpack-path-simplify'
023720e10a cpack: Simplify config file selection
cc3c603061 cpack: Simplify package directory selection logic
a9ad70de76 Source: Avoid using CollapseFullPath just to get parent directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9294
2024-02-29 08:07:24 -05:00
Brad King 21055d6d46 Merge branch 'release-3.29' 2024-02-29 08:05:45 -05:00
Brad King b9bd53620d Merge branch 'release-3.28' 2024-02-29 08:05:43 -05:00
Brad King 966e6afd36 Merge branch 'release-3.28' into release-3.29 2024-02-29 08:05:33 -05:00