mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-23 07:28:51 -06:00
Code Issues Packages Projects Releases Wiki Activity
69,563 Commits 2 Branches 391 Tags
2586a2ce82f53643f44f212c11325bcba8d2d243
Commit Graph

69563 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
2586a2ce82 Merge topic 'ninja-many-subdirs' 
5a36d0c9e7 Ninja: Fix regression with a large number of subdirectories
a30cf4a66a Tests/RunCMake/Configure: Split ninja-specific RerunCMake case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10420
 2025-03-05 08:22:27 -05:00
Brad King
93abad5173 Merge branch 'release-4.0' 2025-03-05 08:20:54 -05:00
Brad King
5b51e43e9d Merge topic 'license-rst' 
00b6a4b592 bootstrap: Update copyright line extraction for reST markup in LICENSE.rst

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10425
 2025-03-05 08:20:54 -05:00
Brad King
581182e8f5 Merge topic 'license-rst' into release-4.0 
00b6a4b592 bootstrap: Update copyright line extraction for reST markup in LICENSE.rst

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10425
 2025-03-05 08:20:52 -05:00
Brad King
00b6a4b592 bootstrap: Update copyright line extraction for reST markup in LICENSE.rst 
Since commit 8d83487e60 (CONTRIBUTORS: Factor contributors list out of
license file, 2025-03-02) the copyright line has reStructuredText
markup.  Filter it out of the copyright line printed by `bootstrap`.
 2025-03-05 06:48:39 -05:00
Kitware Robot
c75a912227 CMake Nightly Date Stamp 2025-03-05 00:05:52 -05:00
Ben Boeckel
5a36d0c9e7 Ninja: Fix regression with a large number of subdirectories 
Since commit f50fb77a4f (Ninja: Regenerate when test or install scripts
are missing, 2024-10-29, v4.0.0-rc1~516^2) the list of paths we pass to
`ninja -t restat` scales with the number of project subdirectories.
Run it in blocks to avoid "command line too long" errors, particularly
on Windows.

Fixes: #26738
 2025-03-04 13:37:01 -05:00
Brad King
a30cf4a66a Tests/RunCMake/Configure: Split ninja-specific RerunCMake case 
Split the test case from commit f50fb77a4f (Ninja: Regenerate when test
or install scripts are missing, 2024-10-29, v4.0.0-rc1~516^2) into a
dedicated case.
 2025-03-04 17:46:31 +01:00
Brad King
7e2f2c9bfb Merge branch 'release-4.0' 2025-03-04 09:40:43 -05:00
Brad King
7177e58d64 Merge topic 'license-rst' 
a9bcf09edd CONTRIBUTORS: Update per-contributor hyperlinks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10419
 2025-03-04 09:40:43 -05:00
Brad King
fb8872653c Merge topic 'license-rst' into release-4.0 
a9bcf09edd CONTRIBUTORS: Update per-contributor hyperlinks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10419
 2025-03-04 09:40:41 -05:00
Brad King
a9bcf09edd CONTRIBUTORS: Update per-contributor hyperlinks 
In commit 2f852580fb (CONTRIBUTORS: Improve formatting of
per-contributor hyperlinks, 2025-03-02) we accidentally added `mailto:`
on a few URLs that should use `https://` instead.

Reported-by: Rolf Eike Beer <eb@emlix.com>
 2025-03-04 08:57:03 -05:00
Brad King
213ea8a752 Merge topic 'patch-ProcessorCount' 
9e40bd860f ProcessorCount: Update documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10407
 2025-03-04 08:48:22 -05:00
Brad King
0af6821799 Merge topic 'cpack-rpm-weak-deps-tags' 
14baa13ab8 CPack/RPM: Add support for all weak dependency tags
847f515934 Tests: Simplify RunCMake.CPack_RPM.SUGGESTS expected output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10415
 2025-03-04 08:47:25 -05:00
Brad King
e5b4cbb22f Merge branch 'release-4.0' 2025-03-04 08:45:07 -05:00
Brad King
f8b284cb3e Merge topic 'fix-cps-component-documentation' 
b8d4c58e6c Merge branch 'backport-fix-cps-component-documentation' into fix-cps-component-documentation
76e11bd4ea Help: Fix find_package documentation about CPS and COMPONENTS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10405
 2025-03-04 08:45:07 -05:00
Brad King
455f2249bc Merge topic 'fix-cps-component-documentation' into release-4.0 
76e11bd4ea Help: Fix find_package documentation about CPS and COMPONENTS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10405
 2025-03-04 08:45:06 -05:00
Brad King
168329857d Merge branch 'release-4.0' 2025-03-04 08:38:11 -05:00
Brad King
bf8f4d4639 Merge topic 'license-rst' 
e2f03680b3 Merge branch 'backport-license-rst' into license-rst
e89ca6e4df Merge branch 'backport-license-rst' (early part) into license-rst
1772622772 LICENSE: Replace references to Copyright.txt with LICENSE.rst
67b6964efa Merge branch 'backport-license-rst' (early part) into license-rst
2f852580fb CONTRIBUTORS: Improve formatting of per-contributor hyperlinks
8d83487e60 CONTRIBUTORS: Factor contributors list out of license file
1fd8a2be4d LICENSE: Clarify role of copyright in contributions
de273b2e11 LICENSE: Replace references to Copyright.txt with LICENSE.rst
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !10416
 2025-03-04 08:38:11 -05:00
Brad King
2dac61ce26 Merge topic 'license-rst' into release-4.0 
2f852580fb CONTRIBUTORS: Improve formatting of per-contributor hyperlinks
8d83487e60 CONTRIBUTORS: Factor contributors list out of license file
1fd8a2be4d LICENSE: Clarify role of copyright in contributions
de273b2e11 LICENSE: Replace references to Copyright.txt with LICENSE.rst
2d42a5444f LICENSE: Rename Copyright.txt to LICENSE.rst
5317564894 Copyright.txt: Add contributor section headers
834c9236e4 Copyright.txt: Remove excess indentation
afeca383d6 Copyright.txt: Drop outdated content around copyright notice line
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !10416
 2025-03-04 08:38:09 -05:00
Kitware Robot
f855d79913 CMake Nightly Date Stamp 2025-03-04 00:07:16 -05:00
Matthew Woehlke
b8d4c58e6c Merge branch 'backport-fix-cps-component-documentation' into fix-cps-component-documentation 
* backport-fix-cps-component-documentation:
  Help: Fix find_package documentation about CPS and COMPONENTS
 2025-03-03 11:49:46 -05:00
Brad King
e2f03680b3 Merge branch 'backport-license-rst' into license-rst 2025-03-03 10:43:55 -05:00
Brad King
e89ca6e4df Merge branch 'backport-license-rst' (early part) into license-rst 2025-03-03 10:43:49 -05:00
Kitware Robot
1772622772 LICENSE: Replace references to Copyright.txt with LICENSE.rst 
```
git grep -lz 'Copyright.txt or https://cmake.org/licensing ' |
  while IFS= read -r -d $'\0' f ; do
    sed -i '/Copyright.txt or https:\/\/cmake.org\/licensing / {
              s/Copyright.txt/LICENSE.rst/
            }' "$f" ; done
```
 2025-03-03 10:43:35 -05:00
Brad King
67b6964efa Merge branch 'backport-license-rst' (early part) into license-rst 2025-03-03 10:42:50 -05:00
Brad King
2f852580fb CONTRIBUTORS: Improve formatting of per-contributor hyperlinks 2025-03-03 09:56:17 -05:00
Brad King
8d83487e60 CONTRIBUTORS: Factor contributors list out of license file 
It is more conventional to list contributors in a dedicated file.
Also drop the long out-of-date sponsorship section.
 2025-03-03 09:56:17 -05:00
Brad King
1fd8a2be4d LICENSE: Clarify role of copyright in contributions 2025-03-03 09:56:17 -05:00
Kitware Robot
de273b2e11 LICENSE: Replace references to Copyright.txt with LICENSE.rst 
```
git grep -lz 'Copyright.txt or https://cmake.org/licensing ' |
  while IFS= read -r -d $'\0' f ; do
    sed -i '/Copyright.txt or https:\/\/cmake.org\/licensing / {
              s/Copyright.txt/LICENSE.rst/
            }' "$f" ; done
```
 2025-03-03 09:56:07 -05:00
Brad King
2d42a5444f LICENSE: Rename Copyright.txt to LICENSE.rst 
The name `LICENSE` is now more conventional.
Format as reStructuredText to improve rendering.
 2025-03-03 09:55:56 -05:00
Balazs Kosaras
14baa13ab8 CPack/RPM: Add support for all weak dependency tags 
Co-authored-by: Brad King <brad.king@kitware.com>
 2025-03-03 09:09:15 -05:00
Brad King
847f515934 Tests: Simplify RunCMake.CPack_RPM.SUGGESTS expected output 
Drop an optional part of the output that is never printed anymore.
 2025-03-03 09:09:14 -05:00
Brad King
5317564894 Copyright.txt: Add contributor section headers 2025-03-03 08:59:09 -05:00
Brad King
834c9236e4 Copyright.txt: Remove excess indentation 2025-03-03 08:59:09 -05:00
Brad King
afeca383d6 Copyright.txt: Drop outdated content around copyright notice line 
The modern convention for BSD 3-Clause license notices does not
include the name of the project or "All rights reserved".
 2025-03-03 08:59:09 -05:00
Konstantin Podsvirov
97eb4ee966 Copyright.txt: Update email 
Backport commit 953daaac85 (Copyright.txt: Update email, 2025-02-25).
 2025-03-03 08:59:09 -05:00
Brad King
a9190bd38d CMake: Prepare dedicated license file for our own CPack configuration 
The CPack WIX Generator requires a `.txt` file extension.
Provide that regardless of the actual license file extension.
 2025-03-03 08:59:09 -05:00
Brad King
759cd843db CMake: De-duplicate references to license file 2025-03-03 08:59:09 -05:00
Brad King
3035ee4ff3 CMake: De-duplicate extraction of copyright line from license file 2025-03-03 08:59:09 -05:00
Brad King
068ea4bfc1 cmake-gui: Update credits in About dialog to reflect status quo 2025-03-03 08:59:08 -05:00
Brad King
11ce980a46 Merge branch 'release-4.0' 2025-03-03 08:57:49 -05:00
Brad King
d1812031a8 Merge topic 'Help-CMAKE_LANG_LINK_MODE-clarify_usage' 
b0d0a8d54f Help: CMAKE_LANG_LINK_MODE: clarify usage.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10411
 2025-03-03 08:57:49 -05:00
Brad King
7b1e57e6ac Merge topic 'Help-CMAKE_LANG_LINK_MODE-clarify_usage' into release-4.0 
b0d0a8d54f Help: CMAKE_LANG_LINK_MODE: clarify usage.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10411
 2025-03-03 08:57:47 -05:00
Brad King
f18c64b153 Merge branch 'release-4.0' 2025-03-03 08:56:56 -05:00
Brad King
759ba45bdb Merge topic 'cpack-rpm-weak-deps' 
283a48403f CPack/RPM: Fix detection of RPM support for weak dependencies
ab4e74ad0b CPack/RPM: Remove redundant conditions for presence of rpmbuild

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10403
 2025-03-03 08:56:55 -05:00
Brad King
3def90f841 Merge topic 'cpack-rpm-weak-deps' into release-4.0 
283a48403f CPack/RPM: Fix detection of RPM support for weak dependencies
ab4e74ad0b CPack/RPM: Remove redundant conditions for presence of rpmbuild

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10403
 2025-03-03 08:56:54 -05:00
Brad King
c2df21d80b Merge branch 'release-4.0' 2025-03-03 08:52:29 -05:00
Brad King
a625829b26 Merge topic 'update-kwsys' 
547c42b294 Merge branch 'upstream-KWSys' into update-kwsys
25ea535aba KWSys 2025-03-01 (1d82baee)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !10408
 2025-03-03 08:52:29 -05:00
Brad King
636a12ff6b Merge topic 'update-kwsys' into release-4.0 
547c42b294 Merge branch 'upstream-KWSys' into update-kwsys
25ea535aba KWSys 2025-03-01 (1d82baee)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !10408
 2025-03-03 08:52:27 -05:00