Commit Graph

69890 Commits

Author SHA1 Message Date
Brad King
25356721e8 Merge branch 'release-3.31' 2025-03-18 09:22:30 -04:00
Brad King
3d02bd7345 Merge branch 'release-3.31' into release-4.0 2025-03-18 09:22:20 -04:00
Brad King
ab3a0bb84a Merge branch 'release-4.0' 2025-03-18 09:21:05 -04:00
Brad King
aecd6bcb1b Merge topic 'doc-CMAKE_CONFIG_DIR'
bbbbab4661 Help: Add 3.31 release note for CMAKE_CONFIG_DIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10474
2025-03-18 09:21:05 -04:00
Brad King
a64c571a32 Merge topic 'doc-CMAKE_CONFIG_DIR' into release-4.0
bbbbab4661 Help: Add 3.31 release note for CMAKE_CONFIG_DIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10474
2025-03-18 09:21:03 -04:00
Brad King
2af6a8596b Merge branch 'release-4.0' 2025-03-18 09:18:49 -04:00
Brad King
73294d2a7d Merge topic 'ASM_MARMASM-config'
9b5915c178 MARMASM: Fix loading linker information

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10487
2025-03-18 09:18:49 -04:00
Brad King
4223b2410f Merge topic 'ASM_MARMASM-config' into release-4.0
9b5915c178 MARMASM: Fix loading linker information

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10487
2025-03-18 09:18:47 -04:00
Brad King
e4bf5e4a53 Merge topic 'doc-CMAKE_CONFIG_DIR' into release-3.31
bbbbab4661 Help: Add 3.31 release note for CMAKE_CONFIG_DIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10474
2025-03-18 09:17:09 -04:00
Brad King
52b62cf4e1 Merge topic 'ASM_MARMASM-config' into release-3.31
9b5915c178 MARMASM: Fix loading linker information

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10487
2025-03-18 09:16:34 -04:00
Kitware Robot
bdf6acd246 CMake Nightly Date Stamp 2025-03-18 00:04:36 -04:00
Brad King
953e5ec831 Merge branch 'backport-export-multiple-set-not-installed' 2025-03-17 18:04:53 -04:00
Martin Duffy
d723409e8e export: Allow multiple exports when only one export is installed
Since commit c8997fc046 (export: Allow depending on targets exported
multiple times, 2024-12-26, v4.0.0-rc1~241^2), it is possible to depend
on a target exported multiple times so long as the target is exported in
only one set and with a consistent namespace.  However, as a
side-effect, a target could not be in multiple export sets even if only
one of those sets was installed.

Update the check so that uninstalled export sets do not count towards a
target being exported multiple times.
2025-03-17 18:01:30 -04:00
Martin Duffy
bed7e90bae cmJSONState: Use StructuredErrors when available
When the version of JsonCpp permits it, use StructuredErrors to generate
error messages for parse errors in the same style as other CMake-generated
JSON error messages.

Fixes: #26717
2025-03-17 14:17:34 -04:00
Marc Chevrier
9b5915c178 MARMASM: Fix loading linker information
Fix misspelled `ASM_DIALECT` variable value.
2025-03-17 12:02:38 -04:00
Peter Kokot
bbbbab4661 Help: Add 3.31 release note for CMAKE_CONFIG_DIR
This was accidentally left out of commit 1df94443fe (fileapi: Add
support for user-wide queries, 2024-08-16, v3.31.0-rc1~177^2).
2025-03-17 11:57:15 -04:00
Brad King
c005babf89 Merge topic 'pkgc-name-prefix'
f59bab006d PkgC: Add NAME and PREFIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !10473
2025-03-17 11:52:18 -04:00
Brad King
ac3c2f2273 Merge topic 'doc-file-api-link-bt'
40039ddbac Help: Document backtrace member of link commandFragments in FileApi manual

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10471
2025-03-17 11:45:37 -04:00
Brad King
0602ffb452 Merge branch 'release-4.0' 2025-03-17 11:44:03 -04:00
Brad King
8a52c4ae56 Merge branch 'release-3.31' 2025-03-17 11:43:56 -04:00
Brad King
2ea2f6bb38 Merge branch 'release-3.31' into release-4.0 2025-03-17 11:43:35 -04:00
Brad King
eca81157aa Merge branch 'release-4.0' 2025-03-17 11:42:05 -04:00
Brad King
46838bbe11 Merge topic 'msvc-c++23'
d54916d03a MSVC: Revert use of temporary -std:c++23preview flag for C++23

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10470
2025-03-17 11:42:05 -04:00
Brad King
89f6be8264 Merge topic 'msvc-c++23' into release-4.0
d54916d03a MSVC: Revert use of temporary -std:c++23preview flag for C++23

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10470
2025-03-17 11:42:03 -04:00
Brad King
662e8aeea8 Merge topic 'msvc-c++23' into release-3.31
d54916d03a MSVC: Revert use of temporary -std:c++23preview flag for C++23

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10470
2025-03-17 11:41:04 -04:00
Kitware Robot
6639ac87b8 CMake Nightly Date Stamp 2025-03-17 00:04:24 -04:00
Peter Kokot
0f27b9bab6
CMakeDetermineVSServicePack: Update documentation 2025-03-16 23:10:15 +01:00
Peter Kokot
fb34f1d630
CMakeExpandImportedTargets: Update documentation 2025-03-16 23:03:05 +01:00
Peter Kokot
d6e1d220a0
GetPrerequisites: Update documentation
This updates the module documentation to ease the upgrade path to
file(GET_RUNTIME_DEPENDENCIES) and syncs formatting as used in other
documentation pages. Lowercase style is used for functions, some missing
arguments added to signatures, and examples section added.
2025-03-16 22:49:09 +01:00
Kitware Robot
212b380718 CMake Nightly Date Stamp 2025-03-16 00:04:26 -04:00
Peter Kokot
7dc53c5362
KDE3Macros: Replace obsolete/deprecated add_file_dependencies()
The AddFileDependencies module is deprecated as of CMake 3.20 but
doesn't emit warnings/deprecation notices yet. This for now only
upgrades the code usage of KDE3Macros module without this deprecated
module.
2025-03-16 02:01:55 +01:00
Peter Kokot
cdda7d044d
Qt4Macros: Replace obsolete/deprecated macro_add_file_dependencies()
The MacroAddFileDependencies module is deprecated as of CMake 3.14 but
doesn't emit warnings/deprecation notices yet. This for now only
upgrades the code usage of Qt4Macros module when used with FindQt4
without this deprecated module.

Additionally, the lowercase style is used in the documentation.
2025-03-16 01:56:37 +01:00
Peter Kokot
dfd6af0460
SelectLibraryConfigurations: Update documentation
This describes the module in more details and adds examples section.
2025-03-16 01:25:38 +01:00
Peter Kokot
99546ef425
Help: Improve DEBUG_CONFIGURATIONS documentation and usage
This adds a short example demonstrating how to set this property.
Additionally, a paragraph is added to the target_link_libraries() and
its debug/optimized keywords to mention that imported targets with
IMPORTED_CONFIGURATIONS property may provide better alternative for
linking.
2025-03-15 15:47:51 +01:00
Peter Kokot
c7a5fc355c
FindQt3: Update documentation
Although the FindQt module (which includes this one) has been deprecated
since CMake 3.14, this update enhances the online documentation for
better readability.

- Additionally, Qt3_FOUND has been added to the documented variable
  list, as it is automatically set by
  find_package_handle_standard_args().
- Examples section added.
2025-03-15 12:14:55 +01:00
Kitware Robot
b5b55827aa CMake Nightly Date Stamp 2025-03-15 00:06:37 -04:00
Vito Gamberini
f59bab006d
PkgC: Add NAME and PREFIX
Fixes: #26067
2025-03-14 15:17:27 -04:00
Brad King
2604f5d8b3 Merge topic 'json-errors-filename'
f134468a98 JSON: Improve JSON error message formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10463
2025-03-14 12:17:02 -04:00
Brad King
3d8954cd20 Merge topic 'patch-CheckLanguage'
7bc642a7eb CheckLanguage: Add include() to example and reword documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10465
2025-03-14 12:15:35 -04:00
Brad King
718886fa60 Merge topic 'FortranCInterface-Cray'
ce45045d50 FortranCInterface: Add support for Cray module mangling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10466
2025-03-14 12:14:16 -04:00
Brad King
c7173f18f8 Merge branch 'release-4.0' 2025-03-14 12:06:43 -04:00
Brad King
40e685d76c Merge topic 'cps-fix-default-configs'
63c96e76f9 cmPackageInfoReader: Fix default configurations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !10469
2025-03-14 12:06:42 -04:00
Brad King
df2ec408c9 Merge topic 'cps-fix-default-configs' into release-4.0
63c96e76f9 cmPackageInfoReader: Fix default configurations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !10469
2025-03-14 12:06:40 -04:00
Brad King
e59e44df75 Merge branch 'release-4.0' 2025-03-14 12:05:36 -04:00
Brad King
6d0db0cfec Merge branch 'release-3.31' 2025-03-14 12:05:30 -04:00
Brad King
bebbd19c5a Merge branch 'release-3.31' into release-4.0 2025-03-14 12:05:18 -04:00
Brad King
9478620cdf Merge branch 'release-4.0' 2025-03-14 11:45:44 -04:00
Brad King
1f59bfaef4 Merge topic 'file-MAKE_DIRECTORY-result-var'
41d91387f6 Merge branch 'backport-3.31-file-MAKE_DIRECTORY-result-var'
3dd701c068 Merge branch 'backport-3.31-file-MAKE_DIRECTORY-result-var' (early part)
397ec37528 file(MAKE_DIRECTORY): Do not make directories for command keywords
a039a1655d file(MAKE_DIRECTORY): Clarify formatting of unexpected arguments error
90d9c79348 file(MAKE_DIRECTORY): Do not make directories for command keywords

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10467
2025-03-14 11:45:44 -04:00
Brad King
af4ea6df00 Merge topic 'file-MAKE_DIRECTORY-result-var' into release-4.0
41d91387f6 Merge branch 'backport-3.31-file-MAKE_DIRECTORY-result-var'
3dd701c068 Merge branch 'backport-3.31-file-MAKE_DIRECTORY-result-var' (early part)
397ec37528 file(MAKE_DIRECTORY): Do not make directories for command keywords
a039a1655d file(MAKE_DIRECTORY): Clarify formatting of unexpected arguments error
90d9c79348 file(MAKE_DIRECTORY): Do not make directories for command keywords

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10467
2025-03-14 11:45:42 -04:00
Brad King
f284aa0e29 Merge topic 'backport-3.31-file-MAKE_DIRECTORY-result-var' into release-3.31
a039a1655d file(MAKE_DIRECTORY): Clarify formatting of unexpected arguments error
90d9c79348 file(MAKE_DIRECTORY): Do not make directories for command keywords

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10467
2025-03-14 11:44:47 -04:00