Commit Graph

36141 Commits

Author SHA1 Message Date
Brad King
03d37ae3ff cmFileCommand: Clarify names and logic using optional<bool> 2024-09-24 08:36:30 -04:00
Brad King
fdceee50e6 Merge topic 'normalize-install-destination-paths'
6a1fac1450 install: Normalize DESTINATION paths
2184fcfb00 Tests: Configure RunCMake.install cases with correct build type
5a8a6dfe81 cmGeneratorExpression: Change Find() parameter type to cm::string_view
d810374b3d install(PACKAGE_INFO): Remove outdated TODO comment
d13ed01d54 Tests: Remove unused files from RunCMake.install

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9800
2024-09-20 10:27:30 -04:00
Brad King
ac8738c077 Merge topic 'update-kwsys'
c89c49d67b Merge branch 'upstream-KWSys' into update-kwsys
5c18d48fda KWSys 2024-09-19 (2d72c140)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9833
2024-09-20 10:12:11 -04:00
Brad King
ce8cd49dd7 Merge topic 'update-libarchive'
387a9a746a libarchive: tar: fix memory leaks when reading symlinks or parsing pax headers
dad12c8010 libarchive: Set build options the way we need for CMake
21affa271e Utilities: Update hard-coded try_compile results for libarchive 3.7.5
fe3f0d469f Merge branch 'upstream-LibArchive' into update-libarchive
9539a0df9c LibArchive 2024-09-13 (12ecf841)
dfbb1f2f0d libarchive: Update script to get 3.7.5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9826
2024-09-20 10:07:48 -04:00
Kitware Robot
7e26c7cad9 CMake Nightly Date Stamp 2024-09-20 00:01:19 -04:00
Brad King
c89c49d67b Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2024-09-19 (2d72c140)
2024-09-19 11:34:52 -04:00
Brad King
77971a3b16 Merge topic 'install-type-libexec'
39603a7e5c install: Add TYPE LIBEXEC for FILES and DIRECTORY

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9817
2024-09-19 11:21:38 -04:00
Brad King
c060073721 Merge topic 'vs-sdk-custom-commands'
fd66818653 VS: Fix custom commands for DOTNET_SDK builds

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9827
2024-09-19 11:18:24 -04:00
Craig Scott
6a1fac1450 install: Normalize DESTINATION paths
The file generated by install(EXPORT) computes _IMPORT_PREFIX
in a way that assumes a normalized path. If the DESTINATION
contains any ../ components, the computed _IMPORT_PREFIX
would be wrong. Force the DESTINATION path to be normalized,
subject to the new CMP0176 policy.

Also normalize all other DESTINATION paths for consistency,
except for INCLUDES DESTINATION, which is not strictly a
destination but rather a search path to add.

Fixes: #26252
2024-09-19 20:31:47 +10:00
Kitware Robot
94cde61e8c CMake Nightly Date Stamp 2024-09-19 00:01:15 -04:00
Calum Robinson
fd66818653 VS: Fix custom commands for DOTNET_SDK builds
Fixes: #23723
2024-09-18 18:26:27 +01:00
Chen Linxuan
39603a7e5c install: Add TYPE LIBEXEC for FILES and DIRECTORY
Signed-off-by: Chen Linxuan <me@black-desk.cn>
2024-09-18 11:05:28 -04:00
Brad King
b69b5a94d1 Merge topic 'execute_process-encoding'
20f059d025 execute_process: Warn on unknown ENCODING value

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9825
2024-09-18 09:41:34 -04:00
Brad King
d68ca050ef Merge topic 'vs-always-restore-net-sdk'
3283ef47d1 VS: Fix DOTNET_SDK builds when no VS_PACKAGE_REFERENCES set

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9807
2024-09-18 09:40:03 -04:00
Brad King
b46ec5734e Merge topic 'autogen-exe-per-config'
32c8cb2960 Autogen: Avoid running multiple cmake_autogen command in Xcode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9810
2024-09-18 09:39:00 -04:00
Brad King
fbb9b19eec Merge topic 'link_deduplication_imported_targets'
502610733f Ensure imported targets in sibling dirs are deduplicated

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9821
2024-09-18 09:37:36 -04:00
Kitware Robot
01d8a955be CMake Nightly Date Stamp 2024-09-18 00:01:13 -04:00
Craig Scott
5a8a6dfe81 cmGeneratorExpression: Change Find() parameter type to cm::string_view 2024-09-18 08:39:59 +10:00
Craig Scott
d810374b3d install(PACKAGE_INFO): Remove outdated TODO comment
The DESTINATION keyword is supported for this form.
2024-09-18 08:39:58 +10:00
Brad King
dad12c8010 libarchive: Set build options the way we need for CMake 2024-09-17 13:03:11 -04:00
Brad King
20f059d025 execute_process: Warn on unknown ENCODING value 2024-09-17 09:20:58 -04:00
Brad King
d6e03018cb Merge topic 'execute_process-encoding'
e782811cfe execute_process: Change default ENCODING to UTF-8
9a4533405b cmExecuteProcessCommand: Explicitly ignore unknown ENCODING values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9822
2024-09-17 09:09:36 -04:00
Kitware Robot
52fd4a3479 CMake Nightly Date Stamp 2024-09-17 00:01:20 -04:00
Calum Robinson
3283ef47d1 VS: Fix DOTNET_SDK builds when no VS_PACKAGE_REFERENCES set
nuget restore always needs to be run for the new DOTNET_SDK style
projects, even when VS_PACKAGE_REFERENCES is empty.

Fixes: #23405
2024-09-16 13:32:19 +01:00
Brad King
e782811cfe execute_process: Change default ENCODING to UTF-8
Windows is heading toward making UTF-8 the preferred MBCS.  As CMake's
internal encoding, `UTF-8` is effectively equivalent to `NONE`, which
was CMake's behavior prior to 3.15's accidental change to `AUTO`.
Behavior of `ENCODING UTF-8` is independent of CMake's internal
encoding, making it in principle a better default than `NONE`.

Add policy CMP0176 for compatibility and to document the default's
history.

Fixes: #26262
2024-09-16 06:37:46 -04:00
Brad King
9a4533405b cmExecuteProcessCommand: Explicitly ignore unknown ENCODING values
The logic did this implicitly before.  Make it easier to follow.
2024-09-16 06:37:15 -04:00
Brad King
7b5f9f1fa2 Merge topic 'ninja-depfile-quoting'
b11323f1e4 Ninja: Fix depfile binding with spaces in path
ad66be9943 cmNinjaTargetGenerator: Factor out helper to add depfile bindings
269c3a13c8 cmNinjaTargetGenerator: Reduce DEP_FILE binding duplication
48ced5fb12 Tests/RunCMake/BuildDepends: Enable more depfile cases with Ninja
b751a857cc Tests/RunCMake/BuildDepends: Simplify CustomCommandDepends case
006891dab9 Tests/RunCMake/BuildDepends: Prepare CompileDepends check for multiple targets
0915320ddf Tests/RunCMake/BuildDepends: Simplify CompileDepends case
24fbfa915c Tests/RunCMake/BuildDepends: Simplify LinkDepends case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9812
2024-09-16 06:20:17 -04:00
Kitware Robot
21e16fa4fa CMake Nightly Date Stamp 2024-09-16 00:01:46 -04:00
Marc Chevrier
502610733f Ensure imported targets in sibling dirs are deduplicated
Fixes: #26284
2024-09-15 16:02:41 +02:00
Orkun Tokdemir
32c8cb2960 Autogen: Avoid running multiple cmake_autogen command in Xcode
Since commit 7c39dabdbc (Autogen: AUTO*_EXECUTABLE: add support for
per-config values, 2023-10-18, v3.29.0-rc1~105^2~1) we were accidentally
running cmake_autogen multiple times for each config.

Fixes: #26282
2024-09-15 15:49:02 +02:00
Kitware Robot
b346afce4f CMake Nightly Date Stamp 2024-09-15 00:01:18 -04:00
Kitware Robot
0cd71e27c2 CMake Nightly Date Stamp 2024-09-14 00:02:10 -04:00
Brad King
844417294b Merge topic 'file-REAL_PATH-warn-non-existing'
00c1161b01 file(REAL_PATH): Warn on non-existing paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9806
2024-09-13 09:25:44 -04:00
Brad King
b11323f1e4 Ninja: Fix depfile binding with spaces in path
In build statements we use a single `DEP_FILE = ...` binding that is
shared between `depfile = $DEP_FILE` and `command = ... $DEP_FILE ...`
bindings in the corresponding rule.  In cases that the command's shell
argument needs quoting, add a separate `depfile = ...` binding to the
build statement to express the depfile path without quoting.  Otherwise
`ninja` tries to open a file path that contains literal quotes.

Fixes: #26287
2024-09-13 09:04:32 -04:00
Kitware Robot
07f0d602c0 CMake Nightly Date Stamp 2024-09-13 00:01:17 -04:00
Brad King
ad66be9943 cmNinjaTargetGenerator: Factor out helper to add depfile bindings 2024-09-12 12:24:48 -04:00
Brad King
269c3a13c8 cmNinjaTargetGenerator: Reduce DEP_FILE binding duplication 2024-09-12 12:24:48 -04:00
Alex Overchenko
00c1161b01 file(REAL_PATH): Warn on non-existing paths
The command is documented to work only for cases that the referenced
path exists.

Fixes: #26260
2024-09-12 08:20:29 -04:00
Brad King
d3518bbb17 Merge topic 'vs-output-name-net-sdk'
66bd326e28 VS: Use OUTPUT_NAME in DOTNET_SDK projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9808
2024-09-12 08:12:51 -04:00
Brad King
b91ea1b368 Merge topic 'file-archive-workdir'
d8a9aabd24 file(ARCHIVE_CREATE): add WORKING_DIRECTORY option
d65b5a8e03 Help: Format file(ARCHIVE*) options as definition lists

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9803
2024-09-12 08:10:54 -04:00
Brad King
2321b88edf Merge topic 'cpack-ifw-product-images'
5b8fa21512 Tests: Add a test covering the CPack IFW Generator
3331c7032f CPack/IFW: Add option for ProductImages URLs
d58f90f628 CPack/IFW: Actually ignore missing ProductImages
3c214f2638 CPack/IFW: Fix generation of ProductImages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9798
2024-09-12 08:09:32 -04:00
Kitware Robot
8ae543d85c CMake Nightly Date Stamp 2024-09-12 00:01:14 -04:00
Yuri Witte
d8a9aabd24 file(ARCHIVE_CREATE): add WORKING_DIRECTORY option
Fixes: #25260
Issue: #21653
2024-09-11 09:52:32 -04:00
Brad King
ac410c7add Merge topic 'genex-tco-subgraph'
4a11772618 GenEx: Limit TARGET_PROPERTY transitive closure optimization to subgraphs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !9789
2024-09-11 09:33:28 -04:00
Brad King
dd023d9707 Merge topic 'add_custom_command-arg-handling'
ec519f3e97 add_custom_command: Validate arguments more rigorously
8dc8be0884 AndroidTestUtilities: Remove DEPENDS that was being silently ignored
316840b430 Tests: Add missing POST_BUILD to custom commands
f5f80305ef ExternalProject: Ensure keywords requiring an argument have one

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9785
2024-09-11 09:32:24 -04:00
Brad King
6971e816ce Merge topic 'parallel-install-bugfix'
a980418f7b cmake --install: Fix concurrency level of parallel install

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9802
2024-09-11 09:27:45 -04:00
Brad King
42556539d7 Merge topic 'update-kwsys'
d195e2c9c8 Merge branch 'upstream-KWSys' into update-kwsys
5293b8ded0 KWSys 2024-09-10 (ac1555b4)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9805
2024-09-11 09:26:15 -04:00
Julien Marrec
3331c7032f CPack/IFW: Add option for ProductImages URLs
Add a `CPACK_IFW_PACKAGE_PRODUCT_IMAGE_URLS` variable for them.
2024-09-11 08:44:09 -04:00
Julien Marrec
d58f90f628 CPack/IFW: Actually ignore missing ProductImages 2024-09-11 08:10:52 -04:00
Calum Robinson
66bd326e28 VS: Use OUTPUT_NAME in DOTNET_SDK projects
Fixes: #26285
2024-09-11 12:25:08 +01:00