mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-09 07:11:05 -06:00
Code Issues Packages Projects Releases Wiki Activity
55,952 Commits 2 Branches 385 Tags
dbfa449f080774fa24eaa5fa2edbee2d32405db3
Commit Graph

55952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
dbfa449f08 Merge topic 'parser-cleanup' 
4959276c02 cmListFileCache: Remove cmCommandContext
0386641142 cmListFileCache: Rename FromCommandContext to FromListFileFunction
3c4fa4c892 cmListFileCache: Move cmListFileFunction earlier

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6899
 2022-01-26 08:05:01 -05:00
Brad King
8732639b79 Merge branch 'release-3.22' 2022-01-26 08:04:15 -05:00
Brad King
6d778ea6db Merge topic 'FindMPI-static-first' 
036d0cbbde FindMPI: Place static first in mpi test source

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6900
 2022-01-26 08:04:15 -05:00
Brad King
94189fc397 Merge topic 'FindMPI-static-first' into release-3.22 
036d0cbbde FindMPI: Place static first in mpi test source

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6900
 2022-01-26 08:04:14 -05:00
Brad King
e2035fb0f9 Merge topic 'FindXercesC-NAMES_PER_DIR' 
47cbc08594 FindXercesC: Use NAMES_PER_DIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6898
 2022-01-26 08:03:16 -05:00
Brad King
a600b9207e Merge topic 'cache-short-paths' 
6f835c3699 cmOutputConverter: Cache Short Paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6887
 2022-01-26 08:02:23 -05:00
Kitware Robot
c4acdcbc1c CMake Nightly Date Stamp 2022-01-26 00:01:16 -05:00
Brad King
036d0cbbde FindMPI: Place static first in mpi test source 
Move the `static` added by commit 8cce0ad32f (FindMPI: Fix missing
static warning in the mpi test source, 2021-06-30, v3.22.0-rc1~502^2) to
the beginning of the line.

Fixes: #23141
 2022-01-25 09:53:24 -05:00
Brad King
5f9ba8c686 Merge branch 'release-3.22' 2022-01-25 09:40:52 -05:00
Brad King
8428e39ed9 CMake 3.22.2 v3.22.2 2022-01-25 08:45:06 -05:00
Brad King
4959276c02 cmListFileCache: Remove cmCommandContext 
Subsume it inside `cmListFileFunction`.
 2022-01-25 08:40:41 -05:00
Brad King
0386641142 cmListFileCache: Rename FromCommandContext to FromListFileFunction 
Accept a `cmListFileFunction` instead of a `cmCommandContext`.
 2022-01-25 08:39:52 -05:00
Brad King
3c4fa4c892 cmListFileCache: Move cmListFileFunction earlier 2022-01-25 08:36:06 -05:00
jpfeuffer
47cbc08594 FindXercesC: Use NAMES_PER_DIR 
This was missing for us for Xerces.

Issue: #20882
 2022-01-25 08:30:21 -05:00
Brad King
fccdf99c39 Merge topic 'FindCUDAToolkit-doc' 
5067b6b6ee FindCUDAToolkit: Remove duplicated targets in docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6892
 2022-01-25 08:26:13 -05:00
Brad King
80eac95172 Merge topic 'fileapi-defer-static-init' 
bfacb49154 fileapi: Make internal "toolchains" field tables more local

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6894
 2022-01-25 08:24:03 -05:00
Brad King
3bcb07c7de Merge branch 'release-3.22' 2022-01-25 08:20:45 -05:00
Brad King
6e11c744c3 Merge topic 'doc-3.22-patches' 
1461eff899 Help: Add missing 3.22.1 section to the release notes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6895
 2022-01-25 08:20:45 -05:00
Brad King
6e60257739 Merge topic 'doc-3.22-patches' into release-3.22 
1461eff899 Help: Add missing 3.22.1 section to the release notes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6895
 2022-01-25 08:20:43 -05:00
Brad King
a87c72cba8 Merge topic 'ep_test_with_build_with_server-arg-fix' 
9406b2073e Tests: Remove stray argument from test invocation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6893
 2022-01-25 08:19:52 -05:00
Brad King
e9744a4492 Merge branch 'release-3.22' 2022-01-25 06:56:59 -05:00
Brad King
2a620b3d31 Merge branch 'release-3.21' into release-3.22 2022-01-25 06:56:48 -05:00
Brad King
9636a19ded Merge branch 'release-3.21' 2022-01-25 06:56:10 -05:00
Brad King
07cc465b1e Merge branch 'release-3.22' 2022-01-25 06:55:47 -05:00
Brad King
5140e7bc30 Merge topic 'ci-xcode-13.2' 
8cb32fc8ad gitlab-ci: update macOS jobs to use Xcode 13.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6897
 2022-01-25 06:55:46 -05:00
Brad King
7f7f3ba277 Merge topic 'ci-xcode-13.2' into release-3.22 
8cb32fc8ad gitlab-ci: update macOS jobs to use Xcode 13.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6897
 2022-01-25 06:55:45 -05:00
Brad King
74f14997c6 Merge branch 'ci-xcode-13.2' into release-3.21 
Merge-request: !6897
 2022-01-25 05:43:40 -05:00
Brad King
8cb32fc8ad gitlab-ci: update macOS jobs to use Xcode 13.2 2022-01-25 05:06:40 -05:00
Clemens Wasser
6f835c3699 cmOutputConverter: Cache Short Paths 
Cache the Short Paths since we only convert the same few paths anyway
and calling `GetShortPathNameW` is really expensive.

Also, compile the code path only on Windows hosts since it only runs
when using a Windows Shell anyway.
 2022-01-25 04:27:15 -05:00
Kitware Robot
28e90f9576 CMake Nightly Date Stamp 2022-01-25 00:01:20 -05:00
Guo
5067b6b6ee FindCUDAToolkit: Remove duplicated targets in docs 
Also remove an unfinished sentence.
 2022-01-24 14:02:58 -05:00
Brad King
1461eff899 Help: Add missing 3.22.1 section to the release notes 
3.22.1 had no release notes because there were no changes to documented
features or interfaces.  Now that we have a 3.22.2 section, add one
for the previous patch release to avoid confusion.
 2022-01-24 12:41:27 -05:00
Brad King
1b46cd534d Merge branch 'release-3.22' 2022-01-24 12:37:52 -05:00
Brad King
d5e3b1ca1e Merge topic 'cmp0128_cuda' 
ee1396e29e CMP0128: Add flag in OLD mode even when standard matches the default
b2c25de8e0 CMP0128: Avoid test code duplication
3a089cd256 CMP0128: Prefix test names with mode
e13dd52535 XL: Detect default extensions mode for legacy compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6890
 2022-01-24 12:37:52 -05:00
Brad King
b13be8613a Merge topic 'cmp0128_cuda' into release-3.22 
ee1396e29e CMP0128: Add flag in OLD mode even when standard matches the default
b2c25de8e0 CMP0128: Avoid test code duplication
3a089cd256 CMP0128: Prefix test names with mode
e13dd52535 XL: Detect default extensions mode for legacy compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6890
 2022-01-24 12:37:51 -05:00
Brad King
63154cbf45 Merge topic 'vs-package-restore' 
9aa7831f05 Presets: add resolve packages setting to build presets.
b2f8f0bb87 cmGlobalVisualStudio10Generator: Auto restore NuGet packages.
193b8fca52 cmBuildOptions: Split build arguments into separate object.
6a10103493 Help: Update preset schema description for version 3 entries.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6761
 2022-01-24 11:46:29 -05:00
Brad King
25441f2617 Merge topic 'update-kwsys' 
ecd5a18928 Merge branch 'upstream-KWSys' into update-kwsys
ca03a9be6c KWSys 2022-01-22 (16e180ad)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6878
 2022-01-24 11:42:30 -05:00
Brad King
e9500bd770 Merge topic 'utf8-decode-empty' 
0bd6009a0c cm_utf8: Fail on empty input range

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6885
 2022-01-24 11:41:40 -05:00
Brad King
bfacb49154 fileapi: Make internal "toolchains" field tables more local 
`Toolchains::DumpToolchain` uses some statically initialized tables.
Move them into its definition.  This may avoid initializing them
when not needed.

Issue: #23126
 2022-01-24 11:33:35 -05:00
Craig Scott
7e72a179a9 Merge topic 'ep-refactor-scripts' 
5fbac2bb24 ExternalProject: Move inline scripts to separate files
8feaa41ee9 ExternalProject: Ensure _ep_set_directories records cmake paths
036517fe0b ExternalProject: Move existing step scripts to separate subdirectory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6888
 2022-01-24 07:05:07 -05:00
Craig Scott
9406b2073e Tests: Remove stray argument from test invocation 
The run_cmake_with_options() command already sets the test
command to ${CMAKE_COMMAND}. The options passed to that
command shouldn't also add another ${CMAKE_COMMAND}.
This removes a warning seen in the output of tests that invoke
__ep_test_with_build_with_server().
 2022-01-24 22:25:06 +11:00
Kitware Robot
6424f7dc7d CMake Nightly Date Stamp 2022-01-24 00:02:24 -05:00
Raul Tambre
ee1396e29e CMP0128: Add flag in OLD mode even when standard matches the default 
Commit 4a0485be (cmStandardLevelResolver: Avoid unnecessary flags, fix unset
level logic, 2021-04-29) unintentionally changed the behavior by modifying the
code to match a pre-existing comment. The resulting behavior change however
matches the intentions of CMP0128, so we simply need to guard it.

Fixes #23122.
 2022-01-23 23:10:28 +02:00
Raul Tambre
b2c25de8e0 CMP0128: Avoid test code duplication 2022-01-23 23:10:28 +02:00
Raul Tambre
3a089cd256 CMP0128: Prefix test names with mode 
Makes clear that these tests are for the NEW behaviour.
 2022-01-23 23:10:28 +02:00
Raul Tambre
e13dd52535 XL: Detect default extensions mode for legacy compiler 
The legacy non-Clang variant seems to support a GNU-like extensions mode, which
is the default. Enable detection for it.
 2022-01-23 23:10:28 +02:00
Kitware Robot
780e61026f CMake Nightly Date Stamp 2022-01-23 00:02:04 -05:00
Craig Scott
5fbac2bb24 ExternalProject: Move inline scripts to separate files 
This makes the scripts easier to work on, since the separate files
don't require the extra level of escaping that the inlined code did.
This also means the scripts can be rendered with appropriate
syntax highlighting in IDEs, etc.
 2022-01-22 23:00:26 +11:00
Carsten Rudolph
9aa7831f05 Presets: add resolve packages setting to build presets. 2022-01-22 06:35:41 -05:00
Carsten Rudolph
b2f8f0bb87 cmGlobalVisualStudio10Generator: Auto restore NuGet packages. 2022-01-22 06:35:41 -05:00