Commit Graph

69428 Commits

Author SHA1 Message Date
Matthew Woehlke
0ba5343b66 cmPackageInfoReader: Fix configuration-specific importing
Modify cmPackageInfoReader to also append the configuration to the
IMPORTED_CONFIGURATIONS property of every target which has configuration
specific properties. We retain pre-populating this with the package's
default_configurations (if specified) in order to ensure that those are
given preference, but we also need to add every configuration that
actually exists in order to ensure that the target is usable, especially
if default_configurations was not provided.
2025-02-11 13:23:29 -05:00
Matthew Woehlke
83b22da7ac cmPackageInfoReader: Inherit cps_version
Modify cmPackageInfoReader to not require schema_version in supplemental
files (i.e. appendices and/or configuration-specific files). This is
important as our own generation is not including cps_version in
supplemental files, and it is forbidden in the same according to a
strict reading of the specification.
2025-02-11 12:32:46 -05:00
Matthew Woehlke
caff0d62c6 cmFindPackageCommand: Simplify cmStrCat
Replace an unnecessary single-character string_view in cmStrCat with a
literal character.
2025-02-11 12:29:06 -05:00
Brad King
1d07da0912 Help: Clarify context of target_link_libraries pre-4.0 behavior documentation
Update paragraphs that exist only to document pre-4.0 behavior to
explicitly state so.

Fixes: #26679
2025-02-11 09:30:57 -05:00
Brad King
b7dc28cb8c Help: Drop target_link_libraries redundant prose on debug/optimized keywords
This is already documented in the overview, and does not need to be
repeated for a specific signature.

Issue: #26679
2025-02-11 09:30:55 -05:00
Brad King
b4bac3018f Help: Drop target_link_libraries mention of CMP0003 and CMP0004
These policies have been removed by CMake 4.0 and have not been
practically relevant in many years.

Issue: #26679
2025-02-11 09:24:07 -05:00
Brad King
639eee1a0c Help: Call out target_link_libraries legacy signatures earlier 2025-02-11 09:23:06 -05:00
Nikita Nemkin
4b7ed0ec79 Help: Clarify find_library() behavior for suffixed libraries
The name is used as-is only if it contains a recognized suffix.
Clarify this behavior and add links to the relevant variables.

Fixes: #18401
2025-02-11 08:50:59 -05:00
Brad King
ab8b94986d Tests: Fix memory leak in CMakeLib.testUVPatches
In commit f189e64126 (Tests: Add cases covering our mkdtemp code paths,
2025-02-07) we forgot to close the libuv default loop.
2025-02-11 07:57:42 -05:00
Brad King
6cd3598241 Merge branch 'release-4.0' 2025-02-11 07:46:48 -05:00
Brad King
2cd962c2c4 Merge topic 'instrumentation-doc-fixes'
32e9d27c88 instrumentation: Remove undocumented binaryDir field from snippets
d88458b5ea instrumentation: Improve documentation for CMake Instrumentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10320
2025-02-11 07:46:48 -05:00
Brad King
b2674f3b38 Merge topic 'instrumentation-doc-fixes' into release-4.0
32e9d27c88 instrumentation: Remove undocumented binaryDir field from snippets
d88458b5ea instrumentation: Improve documentation for CMake Instrumentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10320
2025-02-11 07:46:46 -05:00
Brad King
d4eeee7915 Merge branch 'release-4.0' 2025-02-11 07:45:23 -05:00
Brad King
7ac818927b Merge topic 'print-presets-log-level'
5303ad3823 Presets: Only print presets variables for verbose log level or higher

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10315
2025-02-11 07:45:23 -05:00
Brad King
2baab9b99f Merge topic 'print-presets-log-level' into release-4.0
5303ad3823 Presets: Only print presets variables for verbose log level or higher

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10315
2025-02-11 07:45:21 -05:00
Brad King
4ebf3f771d Merge branch 'release-4.0' 2025-02-11 07:43:52 -05:00
Brad King
2f1dfef868 Merge topic 'update-kwsys'
0938643895 Merge branch 'upstream-KWSys' into update-kwsys
c4206da3f7 KWSys 2025-02-10 (2e2f80f1)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10317
2025-02-11 07:43:52 -05:00
Brad King
3fe49bd9b6 Merge topic 'update-kwsys' into release-4.0
0938643895 Merge branch 'upstream-KWSys' into update-kwsys
c4206da3f7 KWSys 2025-02-10 (2e2f80f1)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10317
2025-02-11 07:43:51 -05:00
Nikita Nemkin
e5fd973b14 VS: Set the linker image version using the target's VERSION property
This matches the behavior of NMake, Ninja and older Visual Studio
generators.

Fixes: #13130
2025-02-11 17:36:34 +05:00
Nikita Nemkin
2e798a4137 VS: Fix UnityBuild test selection in VS10Project tests
Do not overwrite RunCMake_GENERATOR_TOOLSET and do not assume
that it always contains toolset version. (It could be something
like "host=x64".)
2025-02-11 17:36:24 +05:00
Brad King
b902fbd0c6 execute_process: Clarify when a Windows command interpreter is used
We've always executed `.bat` and `.cmd` files through `cmd /c`, but
previously it was implicit in undocumented `CreateProcessW` behavior.
2025-02-11 07:26:56 -05:00
Kitware Robot
7dc37fb326 CMake Nightly Date Stamp 2025-02-11 00:08:22 -05:00
Brad King
e388ed687a execute_process: Improve invocation of .cmd/.bat with spaces
Extend the fix from commit 74c9d40876 (execute_process: Fix invocation
of .cmd/.bat with spaces, 2025-01-31) to work without relying on
conversion to a "short path", which may not exist.  Instead, extending
the `cmd /c` wrapper to `cmd /c call` seems to support spaces directly.

Suggested-by: Alexandru Croitor <alexandru.croitor@qt.io>
Fixes: #26655
2025-02-10 19:44:19 -05:00
Brad King
0867e4f634 Merge branch 'release-4.0' 2025-02-10 19:04:08 -05:00
Brad King
0c349d1e02 Merge branch 'release-3.31' 2025-02-10 19:04:04 -05:00
Brad King
7915d60cc7 Merge branch 'release-3.31' into release-4.0 2025-02-10 19:03:48 -05:00
Brad King
4e72491043 Merge branch 'release-4.0' 2025-02-10 19:02:42 -05:00
Brad King
4dc7455d53 Merge topic 'doc-execute_process-CMP0176-version'
5a2c0407b8 Help: Clarify when execute_process ENCODING UTF-8 became the default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10316
2025-02-10 19:02:42 -05:00
Brad King
120e26b828 Merge topic 'doc-execute_process-CMP0176-version' into release-4.0
5a2c0407b8 Help: Clarify when execute_process ENCODING UTF-8 became the default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10316
2025-02-10 19:02:40 -05:00
Martin Duffy
32e9d27c88 instrumentation: Remove undocumented binaryDir field from snippets
Removes field from snippet files redundant with the index file's "buildDir"
2025-02-10 17:19:10 -05:00
Martin Duffy
d88458b5ea instrumentation: Improve documentation for CMake Instrumentation 2025-02-10 16:57:45 -05:00
Brad King
3f309b7d97 Merge topic 'doc-execute_process-CMP0176-version' into release-3.31
5a2c0407b8 Help: Clarify when execute_process ENCODING UTF-8 became the default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10316
2025-02-10 16:26:53 -05:00
AJIOB
5a2c0407b8 Help: Clarify when execute_process ENCODING UTF-8 became the default
In commit e782811cfe (execute_process: Change default ENCODING to UTF-8,
2024-09-13, v3.31.0-rc1~94^2) we implied this by the version ranges in
the older defaults.  State it explicitly.
2025-02-10 16:18:16 -05:00
Brad King
e9274551ee Merge branch 'release-4.0' 2025-02-10 16:17:35 -05:00
Brad King
464f172610 Merge branch 'release-3.31' 2025-02-10 16:17:26 -05:00
Brad King
dd720b33cb Merge branch 'release-3.31' into release-4.0 2025-02-10 16:17:13 -05:00
Brad King
9a584fa8b7 Merge branch 'release-4.0' 2025-02-10 16:16:22 -05:00
Brad King
d1e0eb405f Merge topic 'linker-configuration-haiku'
379785e869 Linker configuration: Add missing platform Haiku

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10318
2025-02-10 16:16:22 -05:00
Brad King
576abb42cf Merge topic 'linker-configuration-haiku' into release-4.0
379785e869 Linker configuration: Add missing platform Haiku

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10318
2025-02-10 16:16:20 -05:00
Brad King
8332aa3dcb Merge topic 'linker-configuration-haiku' into release-3.31
379785e869 Linker configuration: Add missing platform Haiku

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10318
2025-02-10 11:04:44 -05:00
Begasus
379785e869 Linker configuration: Add missing platform Haiku
Add Haiku information modules missed by commit c1c4cf9545 (Linker
configuration: introduce a new architecture, 2024-06-05,
v3.31.0-rc1~307^2~1).
2025-02-10 10:27:27 -05:00
KWSys Upstream
c4206da3f7 KWSys 2025-02-10 (2e2f80f1)
Code extracted from:

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

at commit 2e2f80f1d074b1f888ff41f5bc5a2229f3eab6a0 (master).

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

Brad Smith (1):
      a13d90c2 SystemInformation: use HW_NCPUONLINE on OpenBSD and NetBSD
2025-02-10 08:27:08 -05:00
Brad King
0938643895 Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2025-02-10 (2e2f80f1)
2025-02-10 08:27:08 -05:00
Brad King
249d786804 Merge branch 'release-4.0' 2025-02-10 08:25:01 -05:00
Brad King
6e337e469c Merge topic 'instrumentation-build-config'
9689155a05 instrumentation: Add Config value to snippet data
ee3a55fc48 cmMakefileGenerator: Update GetConfigName to return const reference

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10300
2025-02-10 08:25:01 -05:00
Brad King
640cf691fe Merge topic 'instrumentation-build-config' into release-4.0
9689155a05 instrumentation: Add Config value to snippet data
ee3a55fc48 cmMakefileGenerator: Update GetConfigName to return const reference

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10300
2025-02-10 08:24:59 -05:00
Brad King
2fb949e9a8 Merge branch 'release-4.0' 2025-02-10 08:21:03 -05:00
Brad King
1f706754d9 Merge topic 'sunos-i386-mkdtemp'
4db9e1009d Solaris: Backport our mkdtemp code paths to SunOS 5.10 i386
f189e64126 Tests: Add cases covering our mkdtemp code paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10313
2025-02-10 08:21:02 -05:00
Brad King
599ad2b12d Merge topic 'sunos-i386-mkdtemp' into release-4.0
4db9e1009d Solaris: Backport our mkdtemp code paths to SunOS 5.10 i386
f189e64126 Tests: Add cases covering our mkdtemp code paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10313
2025-02-10 08:21:01 -05:00
Brad King
c3eae72d6c Merge branch 'release-4.0' 2025-02-10 08:19:47 -05:00