mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-13 01:29:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
60,392 Commits 2 Branches 401 Tags
ff59f62610f3baa178c14916b4fa5e40ae476737
Commit Graph

60392 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King ff59f62610 Merge topic 'cmake-gui-search-invalid-regex' 
cb00fe0892 cmake-gui: do not set search filter if regex is invalid

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Igor Kushnir <igorkuo@gmail.com>
Merge-request: !8018
 2022-12-17 08:45:36 -05:00
Brad King a1b71112d1 Merge topic 'configure-log' 
6c40e0b25e ConfigureLog: Version individual events instead of the whole log
048a02d5bb ConfigureLog: Log try_compile and try_run checks
746c776caf ConfigureLog: Add infrastructure for structured configure event logging
e8b8d82cbf Tests: Generalize RunCMake expectation component names
8d29a0bda6 cmTryRunCommand: Factor out stdout/stderr capture conditions
fdda4095a3 cmCoreTryCompile: Return more semantic information from compile step

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8017
 2022-12-17 08:44:50 -05:00
Craig Scott 20a77bdf17 Merge branch 'release-3.25' 2022-12-17 04:50:00 -05:00
Craig Scott db6da7470a Merge topic 'doc-updates' 
2ee845c0a5 Help: Add version information for SYSTEM option of add_subdirectory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8025
 2022-12-17 04:50:00 -05:00
Craig Scott 94131d632f Merge topic 'doc-updates' into release-3.25 
2ee845c0a5 Help: Add version information for SYSTEM option of add_subdirectory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8025
 2022-12-17 04:49:59 -05:00
Kitware Robot 6755178d24 CMake Nightly Date Stamp 2022-12-17 00:01:10 -05:00
Brad King 6c40e0b25e ConfigureLog: Version individual events instead of the whole log 
In order to support multiple log versions without buffering the
entire log, move versioning to the level of individual events.
Multiple versions of an event may then be logged consecutively.

Issue: #23200
 2022-12-16 10:12:25 -05:00
Matthew Woehlke 048a02d5bb ConfigureLog: Log try_compile and try_run checks 
Add configure log events for `try_compile` and `try_run` results.

Issue: #23200
 2022-12-16 10:12:25 -05:00
Matthew Woehlke 746c776caf ConfigureLog: Add infrastructure for structured configure event logging 
Add infrastructure for a "configure log".  Use YAML for a balance of
machine- and human-readability to records details of configure-time
events in a structured format.

Teach the RunCMake test framework to support matching the configure log.

Issue: #23200
 2022-12-16 10:11:37 -05:00
Kyle Edwards cb00fe0892 cmake-gui: do not set search filter if regex is invalid 
Fixes: #24248
 2022-12-16 09:09:07 -05:00
Brad King eec3aa11fc Merge topic 'genex-config-mapping-imported-targets' 
e455265d72 Genex: Fix CONFIG on imported target with no explicit mapping

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8016
 2022-12-16 09:04:49 -05:00
Luis Caro Campos e455265d72 Genex: Fix CONFIG on imported target with no explicit mapping 
When evaluating the `$<CONFIG>` genex on an imported target has the
`IMPORTED_CONFIGURATIONS` property set, the current project has a config
that does not match any of those, and no explicit configuration mappings
are defined, fall back to the same configuration as `IMPORTED_LOCATION`.

Fixes: #24222
 2022-12-16 09:00:34 -05:00
Brad King d993b48a67 Merge topic 'fix-typos-in_CTEST_CUSTOM_docs' 
e026ce215a Help: Fix command references in CTEST_CUSTOM_ variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8020
 2022-12-16 08:58:07 -05:00
Brad King b08a022baf Merge branch 'release-3.25' 2022-12-16 08:55:23 -05:00
Brad King 1114767ac1 Merge topic 'masm-debug-format' into release-3.25 
a9bd1e34ef VS: Do not enable ASM_MASM debug information unless requested
98ba122a30 ASM_MASM: Populate MSVC debug information format abstraction table

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8022
 2022-12-16 08:55:22 -05:00
Brad King 9be0cdc22f Merge topic 'masm-debug-format' 
64303b9743 ASM_MARMASM: Fix VS flag table entry for debug flag
5f8e4de696 ASM_MARMASM: Populate MSVC debug information format abstraction table
f62a0f53bf Merge branch 'backport-masm-debug-format' into masm-debug-format
a9bd1e34ef VS: Do not enable ASM_MASM debug information unless requested
98ba122a30 ASM_MASM: Populate MSVC debug information format abstraction table

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8022
 2022-12-16 08:55:22 -05:00
Brad King d293320228 Merge branch 'release-3.25' 2022-12-16 08:50:49 -05:00
Brad King 75e440cbab Merge branch 'release-3.24' 2022-12-16 08:50:47 -05:00
Brad King ca9f3f4db7 Merge branch 'release-3.24' into release-3.25 2022-12-16 08:50:39 -05:00
Brad King 93d9da140d Merge branch 'release-3.25' 2022-12-16 08:49:49 -05:00
Brad King b04e53035a Merge topic 'ci-xcode-14.2' 
85d2ce0bfe gitlab-ci: update macOS jobs to use Xcode 14.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8023
 2022-12-16 08:49:49 -05:00
Brad King 0148923b5b Merge topic 'ci-xcode-14.2' into release-3.25 
85d2ce0bfe gitlab-ci: update macOS jobs to use Xcode 14.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8023
 2022-12-16 08:49:48 -05:00
Brad King bf7ff59292 Merge branch 'ci-xcode-14.2' into release-3.24 
Merge-request: !8023
 2022-12-16 08:49:05 -05:00
Marc Chevrier 2ee845c0a5 Help: Add version information for SYSTEM option of add_subdirectory 2022-12-16 14:05:43 +01:00
Kitware Robot 9a3c232dc0 CMake Nightly Date Stamp 2022-12-16 00:01:06 -05:00
Brad King 85d2ce0bfe gitlab-ci: update macOS jobs to use Xcode 14.2 2022-12-15 17:43:58 -05:00
Brad King 64303b9743 ASM_MARMASM: Fix VS flag table entry for debug flag 
`$(VCTargetsPath)\BuildCustomizations\marmasm.xml` defines the
`GenerateDebugInformation` boolean setting to map to `-g`.
 2022-12-15 14:05:53 -05:00
Brad King 5f8e4de696 ASM_MARMASM: Populate MSVC debug information format abstraction table 
In commit 3166547cf6 (ASM_MARMASM: Add support for Microsoft ARM
assembler language, 2022-10-14) we overlooked populating the runtime
library selection flags for the Microsoft ARM assembler, needed since
commit 0e96a20478 (MSVC: Add abstraction for debug information format,
2022-08-25, v3.25.0-rc1~142^2~1).  Its compiler id is `MSVC`, so our
generators expect the table to be populated.  It only supports
`Embedded` debug info.  Use empty flags for the other formats.

Without this fix, enabling the `ASM_MARMASM` language with policy
`CMP0141` set to `NEW` causes an error due to the missing table entries.

Issue: #24249
 2022-12-15 14:04:54 -05:00
Brad King f62a0f53bf Merge branch 'backport-masm-debug-format' into masm-debug-format 2022-12-15 11:55:09 -05:00
Brad King a9bd1e34ef VS: Do not enable ASM_MASM debug information unless requested 
MSBuild enables debug information with MASM by default, but for us
that is not consistent with behavior on other generators.
 2022-12-15 11:53:40 -05:00
Brad King 98ba122a30 ASM_MASM: Populate MSVC debug information format abstraction table 
In commit 0e96a20478 (MSVC: Add abstraction for debug information
format, 2022-08-25, v3.25.0-rc1~142^2~1) we overlooked populating the
runtime library selection flags for the Microsoft assembler.  Its
compiler id is `MSVC`, so our generators expect the table to be
populated.  It only supports `Embedded` debug info.  Use empty flags for
the other formats.

Without this fix, enabling the `ASM_MASM` language with policy `CMP0141`
set to `NEW` causes an error due to the missing table entries.

Fixes: #24249
 2022-12-15 11:53:11 -05:00
Amir Masoud Abdol e026ce215a Help: Fix command references in CTEST_CUSTOM_ variables 
Fixes: #19087
 2022-12-15 11:42:29 -05:00
Kitware Robot 26ab669173 CMake Nightly Date Stamp 2022-12-15 00:01:08 -05:00
Matthew Woehlke e8b8d82cbf Tests: Generalize RunCMake expectation component names 
Do not assume all the component names start in "std".

Co-authored-by: Brad King <brad.king@kitware.com>
 2022-12-14 11:42:29 -05:00
Brad King 8d29a0bda6 cmTryRunCommand: Factor out stdout/stderr capture conditions 2022-12-14 11:42:29 -05:00
Brad King fdda4095a3 cmCoreTryCompile: Return more semantic information from compile step 
Update the `TryCompileCode` signature to allow callers to distinguish
between administrative failures and a compilation failure.  Return
results in a structure to which more information can be added later.
 2022-12-14 11:42:29 -05:00
Brad King dcb1c9c080 Merge topic 'codespell-commit-message' 
42445b2c04 ci: run commit messages through codespell

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !8007
 2022-12-14 09:04:14 -05:00
Brad King 84c2518a7b Merge topic 'COMPILE_DEFINITIONS-property-cleanup' 
7480fa0a5f COMPILE_DEFINITIONS property: ensure leading -D is removed in all cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8004
 2022-12-14 09:03:08 -05:00
Brad King 15dcb41f20 Merge topic 'vectorfix' 
6d15754814 Make vector operations more efficient

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !8010
 2022-12-14 09:01:41 -05:00
Brad King 7ca90d04fc Merge topic 'find_cudatoolkit_add_nvjitlink' 
d37d9c098c FindCUDAToolkit: Support the new `nvJitLink` library in CUDA 12

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8014
 2022-12-14 09:00:29 -05:00
Brad King ac3b6b5f50 Merge branch 'release-3.25' 2022-12-14 08:58:55 -05:00
Brad King 29c4690e0a Merge topic 'cuda-nvcc-cuda20' 
0aeeb8160c CUDA: Add support for cuda_std_20 for nvcc 12.0+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8008
 2022-12-14 08:58:55 -05:00
Brad King 2d3ed58cee Merge topic 'cuda-nvcc-cuda20' into release-3.25 
0aeeb8160c CUDA: Add support for cuda_std_20 for nvcc 12.0+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8008
 2022-12-14 08:58:54 -05:00
Kitware Robot fd8c8e2103 CMake Nightly Date Stamp 2022-12-14 00:01:11 -05:00
Marc Chevrier 7480fa0a5f COMPILE_DEFINITIONS property: ensure leading -D is removed in all cases 
Fixes: #24186
 2022-12-13 16:54:56 +01:00
Kyle Edwards 42445b2c04 ci: run commit messages through codespell 2022-12-13 10:29:20 -05:00
Robert Maynard 0aeeb8160c CUDA: Add support for cuda_std_20 for nvcc 12.0+ 
CUDA 12.0 has been released with support for `-std=c++20`.
 2022-12-13 10:18:15 -05:00
Kitware Robot ff875ed859 CMake Nightly Date Stamp 2022-12-13 00:01:09 -05:00
Robert Maynard d37d9c098c FindCUDAToolkit: Support the new nvJitLink library in CUDA 12 2022-12-12 13:28:50 -05:00
Kitware Robot 07fe1c9eb8 CMake Nightly Date Stamp 2022-12-12 00:01:17 -05:00