mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-22 06:59:01 -06:00
Code Issues Packages Projects Releases Wiki Activity
66,736 Commits 2 Branches 391 Tags
f36d09a0b8c5ad52a4b510d77ebe3c38df258e73
Commit Graph

66736 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
f36d09a0b8 Merge topic 'cpack-wix-per-machine' 
d588e81ffb CPack/WIX: Generate perMachine installers by default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9672
 2024-07-22 10:17:57 -04:00
Brad King
bb497152f0 Merge topic 'llpkgc-integration' 
4b1b35bad3 Merge branch 'upstream-llpkgc' into llpkgc-integration
e2db237fb6 llpkgc 2024-07-18 (7958a1de)
ff79e60dd0 PkgC: Add update-llpkgc script

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9674
 2024-07-22 10:14:16 -04:00
Kitware Robot
a9c5dec8d0 CMake Nightly Date Stamp 2024-07-22 00:03:17 -04:00
Craig Scott
bbfeb44747 Merge topic 'ep-unset-disconnected-vars' 
cd379332c3 ExternalProject: Don't rely on *_disconnected vars being unset by caller

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9677
 2024-07-21 06:29:24 -04:00
Kitware Robot
2f8c67d869 CMake Nightly Date Stamp 2024-07-21 00:01:16 -04:00
Kitware Robot
587a3b41ba CMake Nightly Date Stamp 2024-07-20 00:01:37 -04:00
Craig Scott
cd379332c3 ExternalProject: Don't rely on *_disconnected vars being unset by caller 2024-07-20 12:30:50 +10:00
Vito Gamberini
4b1b35bad3 Merge branch 'upstream-llpkgc' into llpkgc-integration 
# By llpkgc upstream
* upstream-llpkgc:
  llpkgc 2024-07-18 (7958a1de)
 2024-07-19 12:14:40 -04:00
llpkgc upstream
e2db237fb6 llpkgc 2024-07-18 (7958a1de) 
Code extracted from:

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

at commit 7958a1de42b9eec04676d547f6fcf5daa425fbcc (7958a1de42b9eec04676d547f6fcf5daa425fbcc).
 2024-07-19 12:14:39 -04:00
Vito Gamberini
ff79e60dd0 PkgC: Add update-llpkgc script 2024-07-19 12:13:17 -04:00
Brad King
d146baa556 Merge branch 'release-3.30' 2024-07-19 10:05:51 -04:00
Brad King
e544859c8d Merge topic 'ci-cmake-update' 
927300d4a0 ci: Update CMake version to 3.30.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9671
 2024-07-19 10:05:51 -04:00
Brad King
39e8f67a2f Merge topic 'ci-cmake-update' into release-3.30 
927300d4a0 ci: Update CMake version to 3.30.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9671
 2024-07-19 10:05:49 -04:00
Brad King
f99e6101d0 Merge topic 'cmMakefile-refactoring' 
62bb8a77a5 cmMakefile: Teach ConfigureFile to move the temp file instead of copying it
dc38f81237 cmSystemTools: Revise MoveFileIfDifferent to return cmsys::Status
0a0a826b86 cmMakefile: Use find_if instead of manual loop
e0294fa310 cmMakefile: Replace single-char string literal with char for cmStrCat
206961bc60 cmMakefile::FormatListFileStack: Refactor "manual" loop into algorithms
2e16b58b7c cmStringAlgorithms: Move generic strings join function to public API
ce991188f3 cmMakefile::FormatListFileStack: Exit early on empty stack trace
29fb605822 cmMakefile::FormatListFileStack: Refactor 'while' into 'for'
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9635
 2024-07-19 10:05:03 -04:00
Brad King
fb303f6086 Merge topic 'FindCUDAToolkit-clear-failure' 
8f974011ea FindCUDAToolkit: Allow new search locations after failure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9650
 2024-07-19 10:04:17 -04:00
Brad King
a444929cf4 Merge topic 'autogen-ui-rebuild' 
5363bebc1e Autogen: Fix compilation of unchanged source files
68ea116380 Autogen: Fix autogen test separation bugs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9660
 2024-07-19 10:01:43 -04:00
Brad King
4e867bab6c Merge topic 'ctest-failure-summary-labels' 
49e9f817de ctest: Display test labels in failure summary

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9652
 2024-07-19 09:56:58 -04:00
Brad King
a8d8f26828 Merge topic 'aix-archive-shared-libraries' 
d27fe9dfba AIX: Add option to archive shared libraries
98013ad1ca cmXCOFF: Add support for editing binary inside an archive

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9606
 2024-07-19 09:55:58 -04:00
Kitware Robot
c7fca321b9 CMake Nightly Date Stamp 2024-07-19 00:01:14 -04:00
Brad King
d588e81ffb CPack/WIX: Generate perMachine installers by default 
Add policy CMP0172 to set `CPACK_WIX_INSTALL_SCOPE` to `perMachine` by
default.  Follow up commit 60661f6770 (CPack/WiX: Make InstallScope
configurable, 2023-11-07, v3.29.0-rc1~413^2) and commit 614100dbf6
(CPack/WiX: Restore default (missing) InstallScope from 3.28 and lower,
2024-06-05, v3.30.0-rc1~7^2~1).

Issue: #20962
Issue: #26029
 2024-07-18 14:16:54 -04:00
Alex Turbov
62bb8a77a5 cmMakefile: Teach ConfigureFile to move the temp file instead of copying it 
In the variables substitution mode `cmMakefile::ConfigureFile`
was copy file and then remove temporary rendered file.

With updated signature of `MoveFileIfDifferent` it can be used
instead of `CopyFileIfDifferent`.
 2024-07-18 10:29:47 -04:00
Alex Turbov
dc38f81237 cmSystemTools: Revise MoveFileIfDifferent to return cmsys::Status 
Help callers recover errors without relying on global state.
 2024-07-18 10:29:47 -04:00
Alex Turbov
0a0a826b86 cmMakefile: Use find_if instead of manual loop 
...in the `cmMakefile::ValidateCustomCommand()` as it was a warning
issued by `clang-tidy`.
 2024-07-18 10:29:47 -04:00
Alex Turbov
e0294fa310 cmMakefile: Replace single-char string literal with char for cmStrCat 
Also, remove redundant quote escapes.
 2024-07-18 10:29:46 -04:00
Alex Turbov
206961bc60 cmMakefile::FormatListFileStack: Refactor "manual" loop into algorithms 2024-07-18 10:29:46 -04:00
Alex Turbov
2e16b58b7c cmStringAlgorithms: Move generic strings join function to public API 
Move `cmJoinImpl` from `cmStringAlgorithms.cxx` to the
`cmStringAlgorithms.h` as `cmJoinStrings`.  Two existing overloads are
not suitable for reverse iterators due to the hardcoded type of the
first parameter.

The signature is similar to the generic (template) `cmJoin`.  With
`enable_if` "magic", `cmJoinString` could be renamed to `cmJoin` in the
future.

Also, replace `getJoinedLength` with `std::accumulate`.
 2024-07-18 10:29:46 -04:00
Alex Turbov
ce991188f3 cmMakefile::FormatListFileStack: Exit early on empty stack trace 
And deindent the rest of the function.
 2024-07-18 10:29:46 -04:00
Alex Turbov
29fb605822 cmMakefile::FormatListFileStack: Refactor 'while' into 'for' 2024-07-18 10:29:46 -04:00
Alex Turbov
b8fb4b778c cmMakefile::ConfigureFile: Convert 'else' block to early return and deindent 2024-07-18 10:29:46 -04:00
Alex Turbov
d4faff52d3 cmMakefile: strnspn => std::strnspn 2024-07-18 10:29:45 -04:00
Alex Turbov
1df30b6bf2 cmMakefile: Use cmStrCat instead of std::stringstream 2024-07-18 10:29:45 -04:00
Alex Turbov
33986a1c60 cmMakefile: Remove redundant << stream operators 2024-07-18 10:29:45 -04:00
Alex Turbov
b9a5a2b494 cmMakefile: Replace ternary with bool => int cast 2024-07-18 10:29:45 -04:00
Brad King
927300d4a0 ci: Update CMake version to 3.30.1 2024-07-18 09:59:36 -04:00
Brad King
d39b8044b6 Merge branch 'release-3.30' 2024-07-18 09:48:21 -04:00
Brad King
cd386f6425 CMake 3.30.1 v3.30.1 2024-07-18 09:13:21 -04:00
Brad King
de8e176113 Merge topic 'parallel-install' 
159ba027b9 Install: Add parallel installation option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9611
 2024-07-18 09:04:47 -04:00
Brad King
0db6a72651 Merge topic 'doc-compile' 
4b9ed91424 Help: check_*source_compiles and CMAKE_TRY_COMPILE_TARGET_TYPE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9641
 2024-07-18 09:02:05 -04:00
Brad King
078eb8d79d Merge topic 'FindCUDAToolkit-windows-only' 
973b019363 FindCUDAToolkit: Refactor search windows only search directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9648
 2024-07-18 09:01:16 -04:00
Brad King
89dc9a6c41 Merge topic 'ninja-custom-target-build-event-dollar' 
c3c14f04f2 Ninja: Fix build event commands with $-sign on custom targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9662
 2024-07-18 09:00:30 -04:00
Brad King
4221d6b220 Merge topic 'implicit-link-static' 
b3c9b317ff CMakeParseImplicitLinkInfo: Honor gfortran -static-libquadmath flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9664
 2024-07-18 08:59:13 -04:00
Brad King
2168a354bf Merge branch 'release-3.30' 2024-07-18 08:57:48 -04:00
Brad King
f2e52b3124 Merge topic 'vs-cuda' 
a9210a0c02 VS: Restore support for CUDA with no optimization flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !9666
 2024-07-18 08:57:48 -04:00
Brad King
07c1287c87 Merge topic 'vs-cuda' into release-3.30 
a9210a0c02 VS: Restore support for CUDA with no optimization flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !9666
 2024-07-18 08:57:47 -04:00
Brad King
04dba758e5 Merge branch 'release-3.30' 2024-07-18 08:56:32 -04:00
Brad King
24f3862628 Merge topic 'macos-curl-backend' 
f2596dfa0e macOS: Work around bug in system curl 8.{3,4,5} LibreSSL backend

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !9663
 2024-07-18 08:56:32 -04:00
Brad King
d12c3e711d Merge topic 'macos-curl-backend' into release-3.30 
f2596dfa0e macOS: Work around bug in system curl 8.{3,4,5} LibreSSL backend

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !9663
 2024-07-18 08:56:30 -04:00
Kitware Robot
9e6690abeb CMake Nightly Date Stamp 2024-07-18 00:01:11 -04:00
Wim Colgate
49e9f817de ctest: Display test labels in failure summary 
In a complex test environment, there may be a desire to add a test
property label to indicate context. Here is one such example:

    set_property(TEST mygoofytest PROPERTY LABELS might-fail-on-config-change)

Upon looking at the failed test summary, one can quickly decide whether
the failure might be expected or not.

    198 - mygoofytest (Failed)                might-fail-on-config-change
 2024-07-17 13:56:01 -04:00
Orkun Tokdemir
5363bebc1e Autogen: Fix compilation of unchanged source files 
Since generated `ui` headers are added as byproducts of the autogen
target, it causes to compilation of unchanged files.

This commits adds generated `ui` headers to byproducts of the
timestamp target instead of the autogen target's.

Fixes: #25436
Fixes: #26135
 2024-07-17 18:12:04 +02:00