mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-27 01:19:31 -05:00
Code Issues Packages Projects Releases Wiki Activity
61,337 Commits 2 Branches 401 Tags
f8da094786c138fec040518d2c0d63d059a8dd45
Commit Graph

61337 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King f8da094786 Merge topic 'windows-arm64-recursion-limit' 
c68ebee9c2 cmake: Reduce default recursion depth when compiling for Windows ARM64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8302
 2023-03-09 07:35:16 -05:00
Brad King fff41b8fde Merge topic 'tutorial_refactor_cmake_scripts' 
e1f2b35723 Tutorial: Refactor MakeTable commands into MakeTable.cmake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8249
 2023-03-09 07:34:26 -05:00
Kitware Robot 9cb32a481e CMake Nightly Date Stamp 2023-03-09 00:01:19 -05:00
Brad King a3cdf6e12f Merge branch 'release-3.26' 2023-03-08 14:40:49 -05:00
Brad King 454bfa77b2 CMake 3.26.0-rc6 v3.26.0-rc6 2023-03-08 14:04:09 -05:00
Brad King c68ebee9c2 cmake: Reduce default recursion depth when compiling for Windows ARM64 
On Windows ARM64 the stack frames are large enough (at least in Debug
builds) that CMake language recursion to depth 1000 overflows the stack.
Reduce the limit for this compiler.

Suggested-by: Bill Hoffman <bill.hoffman@kitware.com>
 2023-03-08 11:56:44 -05:00
Brad King 7fed8f8016 Merge branch 'release-3.26' 2023-03-08 10:35:40 -05:00
Brad King a4e7b4d75a Merge branch 'release-3.25' 2023-03-08 10:35:31 -05:00
Brad King 3bb826359a Merge branch 'release-3.25' into release-3.26 2023-03-08 10:35:16 -05:00
Brad King 5709a7e572 CMake 3.25.3 v3.25.3 2023-03-08 10:01:06 -05:00
Brad King 111900ecf0 Merge branch 'release-3.26' 2023-03-08 09:51:19 -05:00
Brad King 1150a346ee Merge branch 'release-3.25' 2023-03-08 09:51:12 -05:00
Brad King db8be3b923 Merge branch 'release-3.25' into release-3.26 2023-03-08 09:50:39 -05:00
Brad King 9ee3e2cc7e Merge branch 'release-3.24' into release-3.25 2023-03-08 09:50:32 -05:00
Brad King 11bc16a319 Merge branch 'release-3.24' 2023-03-08 09:50:11 -05:00
Brad King 451d1c8b6c CMake 3.24.4 v3.24.4 2023-03-08 09:15:32 -05:00
Brad King e5845b25d2 Merge topic 'test-minver' 
edf7888f70 Tests: Update RunCMake.include cmake_minimum_required version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8298
 2023-03-08 09:02:31 -05:00
Brad King f80413ccc4 Merge topic 'findmatlab' 
103dbb2fd2 FindMatlab: Windows -wait is only for -r, not -batch
1932ae0284 FindMatlab: refactor: use string(APPEND
c4cacdc7eb FindMatlab: use modern foreach()
af05544c49 FindMatlab: document function input/output
257a3e870e FindMatlab: add Matlab_VERSION and document.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8286
 2023-03-08 09:01:46 -05:00
Brad King 12234b2851 Merge topic 'vs-props-order' 
d3c4c6d630 VS: Import default C++ props file before toolset-specific props file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8294
 2023-03-08 09:00:29 -05:00
Brad King ccf288186a Merge topic 'generate-runcmake-test-script' 
f1aedf2240 Tests/RunCMake: Add script to auto-generate RunCMake test suite stub

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8296
 2023-03-08 08:59:35 -05:00
Brad King 9942115714 Merge topic 'find_cudatoolkit_add_cudla_targets' 
21b102c77d FindCUDAToolkit: Add support for finding Tegra cudla library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8295
 2023-03-08 08:58:46 -05:00
Brad King 9b44cc5feb Merge topic 'doc-signatures' 
3600be4e31 Help: Use signature directive for 'if' command
bedd62d52c Help: Improve sentence structure around "if so"
ae7c4a5ff4 Help: Add internal cross-references to 'if' command docs
95bfacb8bb Help: Indent 'if' command docs more consistently

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8292
 2023-03-08 08:57:33 -05:00
Brad King d8cddc733a Merge branch 'release-3.26' 2023-03-08 08:56:29 -05:00
Brad King e939b82d2e Merge topic 'revert-vs-BuildInParallel' 
abb1c12162 VS: Revert "Build custom commands concurrently when possible"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8297
 2023-03-08 08:56:29 -05:00
Brad King cea9dae92a Merge topic 'revert-vs-BuildInParallel' into release-3.26 
abb1c12162 VS: Revert "Build custom commands concurrently when possible"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8297
 2023-03-08 08:56:28 -05:00
Brad King 5cd2a0993d Merge branch 'release-3.26' 2023-03-08 08:54:09 -05:00
Brad King e7332d3c60 Merge branch 'release-3.25' 2023-03-08 08:54:02 -05:00
Brad King 2e4bb04755 Merge branch 'release-3.24' 2023-03-08 08:53:50 -05:00
Brad King a7e697d5d2 Merge branch 'release-3.25' into release-3.26 2023-03-08 08:53:36 -05:00
Brad King f6264a4e6d Merge branch 'release-3.26' 2023-03-08 08:52:10 -05:00
Brad King ae7f8ee0fb Merge topic 'file-install-macos' 
963440ec01 Merge branch 'backport-3.26-file-install-macos'
81ac174514 Merge branch 'upstream-KWSys' into file-install-macos
a87ea777d4 KWSys 2023-03-08 (a3ff01ab)
a6f5bdd650 Merge branch 'backport-3.24-file-install-macos'
35f2b1bf5b file(INSTALL): Fix file ownership regression when running as root on macOS
a5d6548587 file(INSTALL): Fix file ownership regression when running as root on macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8293
 2023-03-08 08:52:09 -05:00
Brad King d7481673d2 Merge topic 'file-install-macos' into release-3.26 
a6f5bdd650 Merge branch 'backport-3.24-file-install-macos'
35f2b1bf5b file(INSTALL): Fix file ownership regression when running as root on macOS
a5d6548587 file(INSTALL): Fix file ownership regression when running as root on macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8293
 2023-03-08 08:52:08 -05:00
Brad King 84adf3e57f Merge branch 'release-3.24' into release-3.25 2023-03-08 07:45:25 -05:00
Brad King 24f356cd5e Merge branch 'backport-3.24-file-install-macos' into release-3.25 
Merge-request: !8293
 2023-03-08 07:45:15 -05:00
Brad King a6373caaec Merge branch 'backport-3.24-file-install-macos' into release-3.24 
Merge-request: !8293
 2023-03-08 07:44:36 -05:00
Brad King 963440ec01 Merge branch 'backport-3.26-file-install-macos' 2023-03-08 07:39:10 -05:00
Brad King 81ac174514 Merge branch 'upstream-KWSys' into file-install-macos 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2023-03-08 (a3ff01ab)
 2023-03-08 07:38:50 -05:00
KWSys Upstream a87ea777d4 KWSys 2023-03-08 (a3ff01ab) 
Code extracted from:

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

at commit a3ff01ab80c7bb1e08caceb107f323513efbad47 (master).

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

Brad King (1):
      51272e80 SystemTools: Avoid macOS copyfile semantic differences as root
 2023-03-08 07:38:49 -05:00
Brad King a6f5bdd650 Merge branch 'backport-3.24-file-install-macos' 2023-03-08 07:37:35 -05:00
Kitware Robot 394e1540a3 CMake Nightly Date Stamp 2023-03-08 00:01:13 -05:00
Brad King edf7888f70 Tests: Update RunCMake.include cmake_minimum_required version 
This was missed in commit 1edf138506 (Tests/RunCMake: Update
cmake_minimum_required versions, 2023-02-06).

Also tighten up some expected stderr content to catch these
cases during similar updates in the future.
 2023-03-07 17:47:26 -05:00
scivision 103dbb2fd2 FindMatlab: Windows -wait is only for -r, not -batch 2023-03-07 15:34:36 -05:00
scivision 1932ae0284 FindMatlab: refactor: use string(APPEND 2023-03-07 15:34:36 -05:00
scivision c4cacdc7eb FindMatlab: use modern foreach() 
remove unused superseded commented code
 2023-03-07 15:34:35 -05:00
scivision af05544c49 FindMatlab: document function input/output 2023-03-07 15:34:35 -05:00
scivision 257a3e870e FindMatlab: add Matlab_VERSION and document. 
fixes #24569
 2023-03-07 15:32:56 -05:00
Matthew Voss d3c4c6d630 VS: Import default C++ props file before toolset-specific props file 
This avoids overwriting toolset-specific settings like `VCRedistDir`
with default settings.

Fixes: #22420
 2023-03-07 14:41:32 -05:00
Kyle Edwards f1aedf2240 Tests/RunCMake: Add script to auto-generate RunCMake test suite stub 2023-03-07 14:30:29 -05:00
Brad King abb1c12162 VS: Revert "Build custom commands concurrently when possible" 
Since commit 33c15ae2b9 (VS: Build custom commands concurrently when
possible, 2023-01-19, v3.26.0-rc1~56^2) we add `BuildInParallel` to
custom commands in `.vcxproj` files.  However, this can break existing
projects that implicitly rely on serial execution of custom commands.
For example, custom commands in our FindCUDA module run MSVC (via nvcc)
with a common `vc*.pdb` file, and therefore cannot run in parallel.

Revert use of `BuildInParallel` while leaving most of the infrastructure
for it in place.  It can be restored later with an option or policy.

Fixes: #24576
Issue: #18405
 2023-03-07 14:19:49 -05:00
Robert Maynard 21b102c77d FindCUDAToolkit: Add support for finding Tegra cudla library 
Fixes #24575
 2023-03-07 13:47:16 -05:00