Commit Graph

65152 Commits

Author SHA1 Message Date
Brad King 5dd75fdfdd Merge branch 'release-3.29' 2024-02-15 12:57:57 -05:00
Brad King 145d88c612 Merge topic 'cmake-language-exit-code'
86698eea85 cmake_language: Fix EXIT inside control flow blocks
a3033d1a06 Tests: Remove unnecessary RunCMake.cmake_language expected result files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !9250
2024-02-15 12:57:57 -05:00
Brad King 1223c9a398 Merge topic 'cmake-language-exit-code' into release-3.29
86698eea85 cmake_language: Fix EXIT inside control flow blocks
a3033d1a06 Tests: Remove unnecessary RunCMake.cmake_language expected result files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !9250
2024-02-15 12:57:56 -05:00
Brad King 3bdf87aa6f Merge branch 'release-3.29' 2024-02-15 12:56:25 -05:00
Brad King 5764d63692 Merge branch 'release-3.28' 2024-02-15 12:56:18 -05:00
Brad King d7c600c9cd Merge branch 'release-3.28' into release-3.29 2024-02-15 12:56:12 -05:00
Brad King c8da7b0f5c Merge topic 'cxxmodules-collapse-source-paths' into release-3.28
0f0d853de7 cmDyndepCollation: collapse full path before looking up

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9249
2024-02-15 12:55:28 -05:00
Brad King 2763ff2ccc Merge branch 'release-3.29' 2024-02-15 12:54:41 -05:00
Brad King e1e384c999 Merge topic 'cxxmodules-collapse-source-paths'
0f0d853de7 cmDyndepCollation: collapse full path before looking up

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9249
2024-02-15 12:54:41 -05:00
Brad King b13aca575e Merge topic 'cxxmodules-collapse-source-paths' into release-3.29
0f0d853de7 cmDyndepCollation: collapse full path before looking up

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9249
2024-02-15 12:54:39 -05:00
Brad King f3ae5a9684 Merge branch 'release-3.29' 2024-02-15 12:53:16 -05:00
Brad King eeb315f772 Merge topic 'librhash-glibc-version'
e14300816b librhash: aligned_alloc is not available with glibc < 2.15

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9255
2024-02-15 12:53:15 -05:00
Brad King 2f89f1f5e2 Merge topic 'librhash-glibc-version' into release-3.29
e14300816b librhash: aligned_alloc is not available with glibc < 2.15

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9255
2024-02-15 12:53:14 -05:00
Brad King e9d88df971 Merge topic 'genex-quote'
879690ba14 GeneratorExpression: Add $<QUOTE> generator expression

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9242
2024-02-15 12:46:50 -05:00
Brad King 12160f2a16 Merge topic 'cppcheck-fixes'
c934a881e7 Reduce scope of variable
01c22dfaee Range-for loop with const reference
3850def5e6 Use prefix ++ operators for non-primitive types
95a9494974 Remove unused variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9254
2024-02-15 12:43:20 -05:00
Brad King c7f618957b Merge topic 'modules-unused-file'
389dbf0051 Modules: Remove unused CheckLibraryExists.list.in file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9246
2024-02-15 12:41:34 -05:00
Brad King 75f790b3b9 Merge topic 'find-matlab-refactoring'
ab08e75921 FindMatlab: Remove dead commented-out code
91c672e5ae FindMatlab: Use find_package(Threads) instead of checking -pthread
ce426e2a45 FindMatlab: Do not query host processor for registry view
37723c4bee FindMatlab: Refactor Matlab root list append operation
07256587f1 FindMatlab: Simplify ROOT lookup for new and old MCR
657064b6d4 FindMatlab: Refactor: Eliminate _matlab_64Build
c847be4fc7 FindMatlab: Remove extra [Debug] from log message
cd2541bb56 FindMatlab: Remove unnecessary if statements and loops
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9222
2024-02-15 12:39:40 -05:00
Ruslan Baratov 2d72a861d7 IPO: Support duplicate object names in large archives
Apply the fix from commit 1ec6485c6a (Support duplicate object names in
large archives, 2014-04-16, v3.1.0-rc1~629^2) to the IPO-specific
archiving rules.  Use "quick append" instead of "replace".

Fixes: #25675
Issue: #14874
2024-02-15 11:08:45 -05:00
Johannes Schultz c6f56153bb Help: Fix example for return command
`cmake_minimum_required` is the correct command, not
`cmake_version_required`.
2024-02-15 10:42:25 -05:00
Tor Arne Vestbø 021492038e Xcode: Generate BuildableProductRunnable for ProfileAction
Similarly to the LaunchAction we need to associate a runnable
executable with the launch action.
2024-02-15 16:37:07 +01:00
Brad King edb833d69e Tests/CommandLength: Refactor test commands to reduce test run time
Since 2024-02-09 or so this test frequently times out on a few of our
Windows CI runners. Use fewer but longer command lines to achieve a
similar total command length.  By running fewer commands, the test
takes much less time.
2024-02-15 09:40:13 -05:00
Brad King 9365455c78 zstd: Fix compilation with Oracle Studio compiler on Solaris
The compiler does not have `<stdalign.h>`, but does have `_Alignof`:

* https://docs.oracle.com/cd/E77782_01/html/E77788/gnxfh.html#OSSCGgnyfx
2024-02-15 08:56:03 -05:00
Brad King 2ee2aa7074 zstd: Suppress clang-analyzer warnings 2024-02-15 08:43:12 -05:00
Brad King c845da5dfb Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2024-02-15 (aad06964)
2024-02-15 08:37:03 -05:00
KWSys Upstream e34aa12e66 KWSys 2024-02-15 (aad06964)
Code extracted from:

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

at commit aad0696498a4174581910624788d5b537cbb6236 (master).

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

Christoph Grüninger (3):
      d3f3c38b Use prefix ++ operators for non-primitive types
      9fd52415 Range-for loop with const reference
      2310be95 Make variable more local

scivision (1):
      6624edf2 SystemTools:FileIs{Directory,Executable,FIFO}: refactor for simplicity
2024-02-15 08:37:03 -05:00
Kitware Robot 4838861883 CMake Nightly Date Stamp 2024-02-15 00:01:15 -05:00
Ben Boeckel a7424b636b Ninja: make the collator rule use restat = 1
This avoids rebuilds when the module metadata does not change.
2024-02-14 23:01:25 -05:00
Ben Boeckel e24eecfc33 Tests/CXXModules: add a test to ensure that restat works for collation
Also update the `modules-json-file` test to account for the fact that
`CXXModules.json` is not updated for timestamp-only rebuild triggers.

See: #25511
2024-02-14 23:01:25 -05:00
Ben Boeckel 60a8736378 cmNinjaTargetGenerator: scanning depends on the module metadata
Fixes: #25531
2024-02-14 22:36:37 -05:00
Ben Boeckel 52036ce090 Tests/CXXModules: test that objects depend on dependent modules json files 2024-02-14 22:36:37 -05:00
Ben Boeckel 9a45c9fbd5 cmNinjaTargetGenerator: use emplace_back for scanning deps 2024-02-14 20:38:06 -05:00
Ben Boeckel 363300ace5 cxxmodules: depend on the modmap contents
If the modmap changes, we need to recompile. It is not just a file that
needs to exist to compile.

Fixes: #25511
2024-02-14 20:36:47 -05:00
Ben Boeckel 940628d48d Tests/CXXModules: test that objects depend on their modmap files 2024-02-14 20:36:47 -05:00
Ben Boeckel 3f8a59a05c cxxmodules: return failure from the collator when private usage is found 2024-02-14 20:26:59 -05:00
Christoph Grüninger c934a881e7 Reduce scope of variable
Found by Cppcheck (variableScope)
2024-02-14 20:46:03 +01:00
Christoph Grüninger 01c22dfaee Range-for loop with const reference
Prevent copy-ctor and dtor to be called.
Found by Cppcheck (constVariableReference)
2024-02-14 20:46:02 +01:00
Christoph Grüninger 3850def5e6 Use prefix ++ operators for non-primitive types
Prevent unnecessary calls to copy constructor
Found by Cppcheck (postfixOperator)
2024-02-14 20:46:02 +01:00
Christoph Grüninger 95a9494974 Remove unused variable
Found by Cppcheck.
2024-02-14 20:46:02 +01:00
Ben Boeckel 681ee92030 Tests/CXXModules: support testing rebuild conditions 2024-02-14 14:34:07 -05:00
Robert Maynard 879690ba14 GeneratorExpression: Add $<QUOTE> generator expression
Support inserting '"' literals in generator expressions

Fixes #20869
2024-02-14 14:23:18 -05:00
Ben Boeckel 0f0d853de7 cmDyndepCollation: collapse full path before looking up
`cmSourceFile::GetFullPath()` performs a `CollapseFullPath` before
storing the path. Match this behavior when looking up paths from the
source file set constructions.

Fixes: #25614
2024-02-14 11:51:05 -05:00
Brad King e14300816b librhash: aligned_alloc is not available with glibc < 2.15 2024-02-14 09:47:47 -05:00
Brad King 3db63973b3 Merge branch 'upstream-zstd' into update-zstd
* upstream-zstd:
  zstd 2023-04-04 (63779c79)
2024-02-14 09:16:09 -05:00
zstd upstream cd0b9e547a zstd 2023-04-04 (63779c79)
Code extracted from:

    https://github.com/facebook/zstd.git

at commit 63779c798237346c2b245c546c40b72a5a5913fe (v1.5.5).
2024-02-14 09:10:17 -05:00
Brad King fb82a882f6 zstd: Update script to get zstd 1.5.5 2024-02-14 09:10:08 -05:00
Brad King 86698eea85 cmake_language: Fix EXIT inside control flow blocks
These were missed in commit 1bb1769235 (cmake_language: Add EXIT
subcommand, 2024-01-05, v3.29.0-rc1~112^2).

Fixes: #25674
2024-02-14 08:51:48 -05:00
Kitware Robot d6f32880c6 CMake Nightly Date Stamp 2024-02-14 00:01:36 -05:00
Brad King a3033d1a06 Tests: Remove unnecessary RunCMake.cmake_language expected result files
RunCMake defaults to expecting result `0` with empty stderr.
2024-02-13 17:08:50 -05:00
Peter Kokot 389dbf0051 Modules: Remove unused CheckLibraryExists.list.in file
This file template for `CheckLibraryExists` has not been used since
commit 5902279ebc (Fix modules for recent changes, 2002-09-25,
v2.4.0~5118).
2024-02-13 10:05:55 -05:00
Brad King 53d0d80cca Merge branch 'release-3.29' 2024-02-13 09:45:26 -05:00