Commit Graph

71444 Commits

Author SHA1 Message Date
Daniel Pfeifer fa0e5906ff source: Pass cmStringRange by value 2025-07-30 11:55:34 -04:00
Daniel Pfeifer 0c4040057a source: Pass cm::string_view by value 2025-07-30 11:55:33 -04:00
Brad King 1c3300998f Merge topic 'short-object-names'
8180ecad9b autogen: support the `SHORT` intermediate dir strategy
f97d1bf7d8 Visual Studio: support shortened object filenames
a3a190c006 cmcmd: also forward rsp files in `.o` directories
3f33a5387a Makefiles: support shortened object filenames
b121adaa04 Makefiles: pass the target name to `cmake -E cmake_depends`
851e07fda3 Ninja: support short object directories
050f891d81 Tests: choose an explicit FULL strategy in tests expecting it
cce31527f8 Tests/ObjectLibrary: add shortened path tests
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !10833
2025-07-30 11:36:21 -04:00
Brad King 63670ee246 Merge topic 'deb_uniform_compression'
57eed59f35 CPack/DEB: Use the same compression type for control tar

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10981
2025-07-30 10:31:37 -04:00
Brad King 20350c4d59 Merge topic 'update-vim-syntax'
1cf6005af7 Merge branch 'upstream-vim-cmake-syntax' into update-vim-syntax
84dc53ad61 vim-cmake-syntax 2025-07-28 (3c8cd401)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10979
2025-07-30 10:16:20 -04:00
Brad King 188c2d2476 Merge topic 'export-dependencies-unwind'
92b403fc62 install(EXPORT): Use UNWIND_INCLUDE in exported find_dependency()
bba78d656e FindDependency: Split up macro to allow for no_return variant

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !10968
2025-07-30 10:14:47 -04:00
Brad King 1178d15396 Merge topic 'ci-clazy'
15f788814e ci: Configure clazy job to build with system jsoncpp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10982
2025-07-30 10:07:26 -04:00
Kitware Robot 66bf4e95c9 CMake Nightly Date Stamp 2025-07-30 00:05:46 -04:00
Brad King 15f788814e ci: Configure clazy job to build with system jsoncpp
Extend commit bdb9d818d2 (ci: Add lint job to run clazy on our
C++ code, 2025-07-22) to avoid linting third-party jsoncpp code.
2025-07-29 14:56:23 -04:00
kiwixz 57eed59f35 CPack/DEB: Use the same compression type for control tar
Uniform compression is the default since dpkg 1.19.0.
2025-07-29 20:32:48 +02:00
Brad King 60502d75b7 Merge branch 'release-4.1' 2025-07-29 11:13:18 -04:00
Brad King 1cf6005af7 Merge branch 'upstream-vim-cmake-syntax' into update-vim-syntax
* upstream-vim-cmake-syntax:
  vim-cmake-syntax 2025-07-28 (3c8cd401)
2025-07-29 10:43:36 -04:00
vim-cmake-syntax upstream 84dc53ad61 vim-cmake-syntax 2025-07-28 (3c8cd401)
Code extracted from:

    https://github.com/pboettch/vim-cmake-syntax.git

at commit 3c8cd4013fee999e1faa5c6444f946811603aaa3 (master).

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

Craig Scott (1):
      589a68db Fix typo in dependency provider method keyword

Eisuke Kawashima (1):
      0fe3a3dd fix: add undo_indent

Patrick Boettcher (1):
      08fa8f49 update to cmake version 4.1.20250715-g2c3f83a

cos (9):
      4b296b4b fix update instructions
      6d4dbe64 silence vint linter
      d43f2050 silence perlcritic linter
      2b98e3b3 fix bash shebang for test runner
      396c7afc silence shellcheck + yamllint
      57a7c831 improve test portability
      13d84b42 add syntax folding
      c18bb8ec regenerate for folding
      3c8cd401 typofix

namniav (1):
      6b667c41 Fix syntax highlighting for bracket arguments and comments
2025-07-29 10:25:49 -04:00
Brad King f4effce6a4 CMake 4.1.0-rc4 v4.1.0-rc4 2025-07-29 10:17:43 -04:00
Ben Boeckel 8180ecad9b autogen: support the SHORT intermediate dir strategy 2025-07-29 09:44:03 -04:00
John Parent f97d1bf7d8 Visual Studio: support shortened object filenames 2025-07-29 09:44:03 -04:00
Ben Boeckel a3a190c006 cmcmd: also forward rsp files in .o directories 2025-07-29 09:44:03 -04:00
Brad King 2ea26aff0c Merge topic 'patch-FindBZip2-version'
50f41bdf59 FindBZip2: Add BZip2_VERSION

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10975
2025-07-29 09:43:20 -04:00
Brad King e6e5fa0bad Merge branch 'release-4.1' 2025-07-29 09:40:55 -04:00
Brad King 318f90ff5f Merge topic 'revert-install-DIRECTORY-exclude-empty'
21e99dbf49 install(DIRECTORY): Revert "Add EXCLUDE_EMPTY_DIRECTORIES option"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10977
2025-07-29 09:40:54 -04:00
Brad King d9afc6c256 Merge topic 'revert-install-DIRECTORY-exclude-empty' into release-4.1
21e99dbf49 install(DIRECTORY): Revert "Add EXCLUDE_EMPTY_DIRECTORIES option"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10977
2025-07-29 09:40:53 -04:00
John Parent 3f33a5387a Makefiles: support shortened object filenames 2025-07-29 08:28:22 -04:00
Ben Boeckel b121adaa04 Makefiles: pass the target name to cmake -E cmake_depends
When a shortened directory is used, the name of the target is not
accessible just by the path. Pass it explicitly.
2025-07-29 08:06:30 -04:00
John Parent 851e07fda3 Ninja: support short object directories 2025-07-29 08:06:30 -04:00
Ben Boeckel 050f891d81 Tests: choose an explicit FULL strategy in tests expecting it
Since it can be set in the environment when running the test suite,
guard tests which are sensitive to intermediate directory strategy
changes with explicit settings.
2025-07-29 08:06:30 -04:00
John Parent cce31527f8 Tests/ObjectLibrary: add shortened path tests 2025-07-29 08:06:29 -04:00
John Parent 4d58030b92 Tests/UnityBuild: add shortened path tests 2025-07-29 08:06:29 -04:00
John Parent 526a6f2a81 cmGeneratorTarget: shorten PCH filenames 2025-07-29 08:06:29 -04:00
John Parent 1feb801463 cmLocalGenerator: support shortening object filenames 2025-07-29 08:06:29 -04:00
John Parent 76f01de30e cmLocalGenerator: add a GetRelativeSourceFileName method
This will be used for short object path support.
2025-07-29 08:06:29 -04:00
John Parent 324907a60b cmGlobalGenerator: add methods for use when implementing short dir support 2025-07-29 08:06:28 -04:00
Kitware Robot d3e34186f6 CMake Nightly Date Stamp 2025-07-29 00:05:00 -04:00
Brad King 21e99dbf49 install(DIRECTORY): Revert "Add EXCLUDE_EMPTY_DIRECTORIES option"
Revert commit b70ef48b27 (install(DIRECTORY): Add
EXCLUDE_EMPTY_DIRECTORIES option, 2025-04-20, v4.1.0-rc1~212^2).
The implementation had at least two problems:

* It did not exclude the top-level directory if empty.
* It did not exclude non-empty directories whose contents are
  all filtered out.

Revert the feature pending a revised implementation.

Issue: #19189
Closes: #27092
2025-07-28 14:21:09 -04:00
John Parent e1041bd270 cmLocalCommonGenerator: factor out "long" directory calculation 2025-07-28 12:01:28 -04:00
Ben Boeckel c4bf198aed cmGeneratorTarget: add a query for whether to use short object names 2025-07-28 12:01:28 -04:00
Ben Boeckel 02b2153d84 cmGlobalGenerator: add a query to represent support for short object names 2025-07-28 12:01:28 -04:00
John Parent 392543384f cmake: support setting the intermediate dir strategy from the environment 2025-07-28 12:01:28 -04:00
John Parent c6763bb021 ctest: support a new --objects-dir argument
When shorter object directories are used, CTest needs to know where to
look for artifacts.
2025-07-28 12:01:28 -04:00
Ben Boeckel dcba9ed828 Makefiles: populate the TARGET_SUPPORT_DIR replacement variable 2025-07-28 12:01:27 -04:00
Ben Boeckel dfba904178 Ninja: populate the TARGET_SUPPORT_DIR replacement variable 2025-07-28 12:01:27 -04:00
Ben Boeckel d1393cc69e cmRulePlaceholderExpander: expand <TARGET_SUPPORT_DIR> placeholders 2025-07-28 12:01:27 -04:00
Ben Boeckel cf1a17861b cmLocalGenerator: add <CMAKE_{BINARY,SOURCE}_DIR> expanders 2025-07-28 12:01:27 -04:00
Ben Boeckel f928be199c Tests/RunCMake/AutoExport: fix typo in AIX build directory name 2025-07-28 12:01:27 -04:00
Brad King a69131cd88 Merge topic 'export-refactor'
078b96f927 cmExportCommand: Refactor export(EXPORT ... ) to use subparsers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10965
2025-07-28 11:08:24 -04:00
Brad King 211e652731 Merge topic 'doc-add_test-old'
b3f2455862 Help: The old add_test() form does not support TEST_LAUNCHER

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10970
2025-07-28 11:06:24 -04:00
Brad King 61d937358b Merge branch 'release-4.1' 2025-07-28 10:22:56 -04:00
Brad King 6d9c3809b7 Merge branch 'release-4.0' into release-4.1 2025-07-28 10:22:48 -04:00
Brad King 1de7545e43 Merge topic 'backport-determine-abi-fix' into release-4.1
41fbc2ce16 CMakeDetermineCompilerABI: Make ABI info string more robust

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10973
2025-07-28 10:22:08 -04:00
Brad King a0f502ae78 Merge branch 'release-4.0' 2025-07-28 10:21:08 -04:00
Brad King 5c41595b91 Merge branch 'release-3.31' 2025-07-28 10:20:47 -04:00