Commit Graph

63862 Commits

Author SHA1 Message Date
Michael Hirsch ec2ad53d18 Modules: refactor compiler find to use modern foreach 2023-11-18 19:08:00 -05:00
Kitware Robot ee3e050d23 CMake Nightly Date Stamp 2023-11-18 00:01:12 -05:00
Brad King 6f8532fbfa Merge topic 'autogen-rsp'
232610e60e Autogen: Use new API for limiting autogen command line lengths
7a07887055 Autogen: Add support for response files for moc predef targets
7eb5ab2c63 Autogen: Generalize MaybeWriteMocResponseFile to MaybeWriteResponseFile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8944
2023-11-17 08:23:18 -05:00
Brad King 08f5e09f9f Merge topic 'UseSWIG-csharp-dllimport'
342b1b8a69 UseSWIG: ensure generated CSharp source code is portable.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8973
2023-11-17 08:20:23 -05:00
Brad King 25fcc7e3de Merge topic 'FetchContent-find_package-args'
42dbdf8914 FetchContent: Fix syntax to forward FIND_PACKAGE_ARGS arguments correctly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8967
2023-11-17 08:19:35 -05:00
Brad King 194d66c952 Merge branch 'release-3.28' 2023-11-17 08:18:42 -05:00
Brad King b6688f11df Merge topic 'update-kwiml'
f2cc0ef2ed Merge branch 'upstream-KWIML' into update-kwiml
83dd9be285 KWIML 2023-11-16 (500bc253)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8978
2023-11-17 08:18:42 -05:00
Brad King 52ce26b9d3 Merge topic 'update-kwiml' into release-3.28
f2cc0ef2ed Merge branch 'upstream-KWIML' into update-kwiml
83dd9be285 KWIML 2023-11-16 (500bc253)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8978
2023-11-17 08:18:41 -05:00
Brad King c78240c406 Merge branch 'release-3.28' 2023-11-17 08:11:55 -05:00
Brad King 066ae7051c Merge topic 'doc-deprecated-hanging-indent'
b553ac4c2f Utilities/Sphinx: Add hanging indent to deprecation notes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8976
2023-11-17 08:11:55 -05:00
Brad King 5595976c11 Merge topic 'doc-deprecated-hanging-indent' into release-3.28
b553ac4c2f Utilities/Sphinx: Add hanging indent to deprecation notes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8976
2023-11-17 08:11:54 -05:00
Kitware Robot 1aa095c8ed CMake Nightly Date Stamp 2023-11-17 00:01:08 -05:00
Brad King f2cc0ef2ed Merge branch 'upstream-KWIML' into update-kwiml
* upstream-KWIML:
  KWIML 2023-11-16 (500bc253)
2023-11-16 15:15:51 -05:00
Brad King b553ac4c2f Utilities/Sphinx: Add hanging indent to deprecation notes
Extend commit 038f4c12e3 (Utilities/Sphinx: Add hanging indent to
version notes, 2023-03-14, v3.27.0-rc1~322^2) to cover `deprecated`
directives.
2023-11-16 14:27:54 -05:00
KWIML Upstream 83dd9be285 KWIML 2023-11-16 (500bc253)
Code extracted from:

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

at commit 500bc25359cdf9e7357315ae3a6c05d606d93ea3 (master).

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

Brad King (1):
      500bc253 codespell: fix typos
2023-11-16 11:18:55 -05:00
tophoo 232610e60e Autogen: Use new API for limiting autogen command line lengths 2023-11-16 16:29:29 +01:00
tophoo 7a07887055 Autogen: Add support for response files for moc predef targets
Add support for response files for moc predef targets and make the limit when
to use response files for autogen targets configurable.
2023-11-16 16:29:02 +01:00
Brad King 2c923a7e28 Merge topic 'install-export-xcframework'
37bc3400cd CMakePackageConfigHelpers: Add generate_apple_platform_selection_file()
256bb0cc40 install(EXPORT): Add ability to point to .xcframework file
a90968e044 cmExportBuildFileGenerator: Add structs for target exports

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jason Juang <jasjuang@gmail.com>
Merge-request: !8969
2023-11-16 09:13:16 -05:00
Brad King f6d65c622c Merge topic 'doc-file'
e48f2e69b5 Help: Clarify file() command multi-value argument placeholders

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8975
2023-11-16 09:11:52 -05:00
Kitware Robot 572f3105c1 CMake Nightly Date Stamp 2023-11-16 00:01:10 -05:00
Brad King e48f2e69b5 Help: Clarify file() command multi-value argument placeholders
Use `<placeholder>...` syntax to imply "zero or more", as we do elsewhere.
2023-11-15 10:56:17 -05:00
Brad King aed9a14cd4 Merge branch 'release-3.28' 2023-11-15 10:30:27 -05:00
Brad King 0b6c6bb1ea CMake 3.28.0-rc5 v3.28.0-rc5 2023-11-15 09:54:28 -05:00
Brad King 4bd90b643f Merge branch 'release-3.28' 2023-11-15 09:44:37 -05:00
Brad King 5bc9c2d6ac Merge branch 'release-3.27' 2023-11-15 09:44:17 -05:00
Brad King cd74246331 Merge branch 'release-3.27' into release-3.28 2023-11-15 09:43:56 -05:00
Kyle Edwards 37bc3400cd CMakePackageConfigHelpers: Add generate_apple_platform_selection_file()
Issue: #25262
2023-11-15 09:10:58 -05:00
Kyle Edwards 256bb0cc40 install(EXPORT): Add ability to point to .xcframework file
Issue: #25262
2023-11-15 09:10:58 -05:00
Brad King 9cfff766eb CMake 3.27.8 v3.27.8 2023-11-15 08:55:18 -05:00
Brad King 3e890fdba3 Merge branch 'release-3.28' 2023-11-15 08:46:39 -05:00
Brad King b43d04eaab Merge branch 'release-3.27' 2023-11-15 08:46:37 -05:00
Brad King c2a4c3915b Merge branch 'release-3.27' into release-3.28 2023-11-15 08:46:31 -05:00
Brad King bc9ca0331b Merge branch 'backport-target-objects' into release-3.27
Merge-request: !8974
2023-11-15 08:45:45 -05:00
Brad King 87778e137b Merge branch 'release-3.28' 2023-11-15 08:44:41 -05:00
Brad King 175988a37a Merge topic 'target-objects'
d7988ff6b8 Merge branch 'backport-target-objects' into target-objects
1814853081 cmCommonTargetGenerator: Drop unused local variable
377b78aef9 cmComputeLinkInformation: Simplify recording OBJECT libraries as link items
50fdaf8f1f cmComputeLinkInformation: Track targets named by TARGET_OBJECTS sources
0e26bd334d cmCommonTargetGenerator: Factor out GetLinkedTargetDirectories loop body

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !8974
2023-11-15 08:44:40 -05:00
Brad King 49c8e89bae Merge topic 'target-objects' into release-3.28
d7988ff6b8 Merge branch 'backport-target-objects' into target-objects
1814853081 cmCommonTargetGenerator: Drop unused local variable
377b78aef9 cmComputeLinkInformation: Simplify recording OBJECT libraries as link items
50fdaf8f1f cmComputeLinkInformation: Track targets named by TARGET_OBJECTS sources
0e26bd334d cmCommonTargetGenerator: Factor out GetLinkedTargetDirectories loop body

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !8974
2023-11-15 08:44:39 -05:00
Brad King 105ac2670b Merge topic 'doc-find_package-advice'
d007d304ff Help: FetchContent FIND_PACKAGE_ARGS REQUIRED usually inappropriate
6341267780 Help: Note ways CMAKE_..._FIND_PACKAGE_... vars can break projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8951
2023-11-15 08:38:54 -05:00
Adam Šulc 42dbdf8914 FetchContent: Fix syntax to forward FIND_PACKAGE_ARGS arguments correctly
Previously we incorrectly mixed list operations with string operations.
2023-11-15 08:22:19 -05:00
Kitware Robot 403374a81c CMake Nightly Date Stamp 2023-11-15 00:01:10 -05:00
Brad King d7988ff6b8 Merge branch 'backport-target-objects' into target-objects 2023-11-14 15:42:07 -05:00
Brad King 1814853081 cmCommonTargetGenerator: Drop unused local variable 2023-11-14 15:40:33 -05:00
Brad King 377b78aef9 cmComputeLinkInformation: Simplify recording OBJECT libraries as link items
Simplify commit 2c7acd34e2 (cmComputeLinkInformation: add `OBJECT`
libraries as link items, 2023-07-24, v3.28.0-rc1~279^2) using the
existing local variables.
2023-11-14 15:40:29 -05:00
Brad King 50fdaf8f1f cmComputeLinkInformation: Track targets named by TARGET_OBJECTS sources
Since commit b6a5382217 (Ninja: depend on language module information
files directly, 2023-02-10, v3.27.0-rc1~502^2), the return value of
`cmCommonTargetGenerator::GetLinkedTargetDirectories` must account for
linked object libraries because they may provide modules (#25112).
These were added by commit b665966933 (cmComputeLinkInformation: track
OBJECT library dependencies, 2023-07-22, v3.27.1~5^2).  However, targets
named by `$<TARGET_OBJECTS:...>` sources are also needed (#25365).

The latter were added by commit 22da18b995 (Fortran: Restore support for
TARGET_OBJECTS providing modules, 2023-10-27, v3.28.0-rc4~9^2) and
commit 035302b7e3 (cmComputeLinkDepends: also copy the target from
object link items, 2023-10-27, v3.28.0-rc4~9^2~2).  However, their
approach added link entries not actually specified by projects.  It also
incorrectly re-used `cmComputeLinkDepends::AddLinkObject` for object
library targets when it is meant for their individual object files.
These problems caused additional regressions (#25417).  Revert the
implementation parts of those commits and leave behind an assertion and
comment to help avoid the mistake in the future.  Instead, track targets
named by `$<TARGET_OBJECTS:...>` sources with a dedicated member.

Issue: #25112
Issue: #25365
Fixes: #25417
Co-authored-by: Ben Boeckel <ben.boeckel@kitware.com>
2023-11-14 14:50:08 -05:00
tophoo 7eb5ab2c63 Autogen: Generalize MaybeWriteMocResponseFile to MaybeWriteResponseFile 2023-11-14 20:08:48 +01:00
Brad King 0e26bd334d cmCommonTargetGenerator: Factor out GetLinkedTargetDirectories loop body
Re-use the body in multiple loops instead of allocating to combine them.
2023-11-14 13:50:13 -05:00
Marc Chevrier 342b1b8a69 UseSWIG: ensure generated CSharp source code is portable.
Fixes: #25405
2023-11-14 17:10:03 +01:00
Kyle Edwards a90968e044 cmExportBuildFileGenerator: Add structs for target exports 2023-11-14 09:22:53 -05:00
Brad King f22ecbacb6 Merge topic 'export-find_dependency-calls'
0ad8fc5a63 FetchContent: Set CMAKE_EXPORT_FIND_PACKAGE_NAME
c6e6861e63 install(EXPORT): Export find_dependency() calls
2837f592ab cmExportFileGenerator: Add function to set required CMake version
e62a3b8625 Help/export: Add signature directives

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Acked-by: Jason Juang <jasjuang@gmail.com>
Merge-request: !8957
2023-11-14 09:22:13 -05:00
Brad King 9b36209698 Merge topic 'FindBLAS-LAPACK-OpenBLAS-mingw'
6ce94ae0b7 Find{BLAS,LAPACK}: Fix OpenBLAS ILP64 support with MSYS2 packages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8968
2023-11-14 09:10:24 -05:00
Brad King 380b324103 Merge topic 'sources-per-config'
16c5977504 Fix per-config sources in multi-config generators when first config adds none

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8971
2023-11-14 09:09:15 -05:00