mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-01 12:18:36 -06:00
Code Issues Packages Projects Releases Wiki Activity
60,531 Commits 2 Branches 391 Tags
d4bf7d80c618930e6b88c35d271a5b0a0656bb7b
Commit Graph

60531 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
d4bf7d80c6 try_compile: Add a NO_LOG option to skip recording in the configure log 2023-01-16 17:16:12 -05:00
Brad King
9d9e8450a8 try_compile: Add optional LOG_DESCRIPTION to record in configure log 
Issue: #23200
 2023-01-16 16:58:50 -05:00
Brad King
65ed5c2ca8 try_compile: Report underlying error when COPY_FILE fails 2023-01-16 16:58:49 -05:00
Brad King
0418efb7ad Tests: Add explicit ConfigureLog case to RunCMake.try_compile 2023-01-16 16:58:49 -05:00
Brad King
189557bd74 cmake: Make entire in-progress check stack available internally 
Represent it as a `vector` so we can iterate over the whole stack.
 2023-01-16 16:58:49 -05:00
Brad King
96ce3581ab Help: Clarify backtrace order in cmake-configure-log(7) 2023-01-13 13:21:41 -05:00
Brad King
485a72dc64 Merge topic 'vs-masm-flags' 
81f670fa83 VS: Honor compile options for MASM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8068
 2023-01-13 08:59:01 -05:00
Brad King
be4dcdf100 Merge topic 'FindMatlab-macos-rosetta' 
1bc9b0f256 FindMatlab: accommodate Matlab running under Rosetta
8dcd14bb87 FindMatlab: simplify mexext find logic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8063
 2023-01-13 08:57:43 -05:00
Brad King
5dddc49e03 Merge topic 'fea/add-copy_directory_if_different' 
c1170b5602 cmake: Add -E copy_directory_if_different

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8059
 2023-01-13 08:54:21 -05:00
Brad King
a547f315dd Merge topic 'deprecate-findunixcmds' 
0847682c47 FindUnixCommands: Deprecate in favor of cmake -E

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8061
 2023-01-13 08:53:30 -05:00
Brad King
f1034acb02 Merge branch 'release-3.25' 2023-01-13 08:47:20 -05:00
Brad King
043ed0ce41 Merge topic 'try_run-cross-compile' 
5cd5c8cac5 Merge branch 'backport-try_run-cross-compile' into try_run-cross-compile
0191e8b512 try_run: Do not require unrequested stdout/stderr when cross-compiling
2f85ec0a37 try_run: Avoid crash in keyword-dispatched signature when cross-compiling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8066
 2023-01-13 08:47:20 -05:00
Brad King
e35255f2a5 Merge topic 'try_run-cross-compile' into release-3.25 
2f85ec0a37 try_run: Avoid crash in keyword-dispatched signature when cross-compiling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8066
 2023-01-13 08:47:19 -05:00
Brad King
73c867895d Merge branch 'release-3.25' 2023-01-13 08:45:38 -05:00
Brad King
ff7e813fc1 Merge topic 'implicit-includes' 
607bccb4ef Restore implicit include directory extraction for adaptive relative paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8067
 2023-01-13 08:45:38 -05:00
Brad King
2d9e66a23b Merge topic 'implicit-includes' into release-3.25 
607bccb4ef Restore implicit include directory extraction for adaptive relative paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8067
 2023-01-13 08:45:37 -05:00
Brad King
c546888b7d Merge branch 'release-3.25' 2023-01-13 08:43:30 -05:00
Brad King
1efb3c5870 Merge topic 'IntelLLVM-msvc-no-cxx11' 
88f9fdcb03 IntelLLVM: Avoid unnecessary -Qstd=c++11 flag on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8069
 2023-01-13 08:43:30 -05:00
Brad King
45da44cc23 Merge topic 'IntelLLVM-msvc-no-cxx11' into release-3.25 
88f9fdcb03 IntelLLVM: Avoid unnecessary -Qstd=c++11 flag on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8069
 2023-01-13 08:43:29 -05:00
Brad King
e756810c1c Merge branch 'release-3.25' 2023-01-13 08:41:41 -05:00
Brad King
91c26b3b29 Merge branch 'release-3.24' 2023-01-13 08:41:39 -05:00
Brad King
2a773db7af Merge branch 'release-3.23' 2023-01-13 08:41:37 -05:00
Brad King
97b4a0f5e3 Merge branch 'release-3.24' into release-3.25 2023-01-13 08:41:23 -05:00
Brad King
4829c3a12b Merge branch 'release-3.25' 2023-01-13 08:39:41 -05:00
Brad King
8cf8c24df2 Merge topic 'IntelLLVM-no-icpx-on-Windows' 
870d89627f Help: Clarify compiler id distinction between Intel Classic and IntelLLVM
ea4cfb3b53 Merge branch 'backport-IntelLLVM-no-icpx-on-Windows'
8834e4d6a5 IntelLLVM: Avoid finding not-yet-supported icpx on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8041
 2023-01-13 08:39:41 -05:00
Brad King
5cb5d3f17b Merge topic 'IntelLLVM-no-icpx-on-Windows' into release-3.25 
870d89627f Help: Clarify compiler id distinction between Intel Classic and IntelLLVM
ea4cfb3b53 Merge branch 'backport-IntelLLVM-no-icpx-on-Windows'
8834e4d6a5 IntelLLVM: Avoid finding not-yet-supported icpx on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8041
 2023-01-13 08:39:40 -05:00
Kitware Robot
c759f4605c CMake Nightly Date Stamp 2023-01-13 00:01:14 -05:00
Brad King
88f9fdcb03 IntelLLVM: Avoid unnecessary -Qstd=c++11 flag on Windows 
The IntelLLVM compiler, for compatibility with MSVC on Windows, always
runs with support for at least C++14.  The `-Qstd=c++11` flag just
causes a warning that it is unused.

Fixes: #24316
 2023-01-12 15:58:14 -05:00
Brad King
81f670fa83 VS: Honor compile options for MASM 
The Ninja and Makefile generators honor `target_compile_options`
and friends for MASM `.asm` sources.  Teach the VS generator to
honor them too for consistency.

Fixes: #24289
 2023-01-12 14:35:38 -05:00
Brad King
5cd5c8cac5 Merge branch 'backport-try_run-cross-compile' into try_run-cross-compile 2023-01-12 13:55:57 -05:00
Brad King
0191e8b512 try_run: Do not require unrequested stdout/stderr when cross-compiling 
Since commit 048a02d5bb (ConfigureLog: Log try_compile and try_run
checks, 2022-11-23) we always capture the stdout/stderr for logging.
When cross-compiling, do not require `__TRYRUN_OUTPUT_STD{OUT,ERR}`
variables to be populated just for the logging.
 2023-01-12 13:55:52 -05:00
Brad King
607bccb4ef Restore implicit include directory extraction for adaptive relative paths 
Update the logic added by commit ef41d49812 (Fix implicit include
directory extraction for adaptive relative paths, 2019-04-08,
v3.14.2~5^2) to account for the new `try_compile` work directory used
for the ABI check since commit 2edf0fc6d7 (Modules: Use new
keyword-dispatched try_compile signature, 2022-09-13,
v3.25.0-rc1~144^2).

Paths relative to the work directory will now have one more `../`
in them, so update the test data to match.

Fixes: #24279
 2023-01-12 12:05:42 -05:00
FeRD (Frank Dana)
0847682c47 FindUnixCommands: Deprecate in favor of cmake -E 
`${CMAKE_COMMAND} -E` subcommands are cross-platform replacements.

Fixes: #24263
 2023-01-12 11:34:48 -05:00
Brad King
2f85ec0a37 try_run: Avoid crash in keyword-dispatched signature when cross-compiling 
Since commit aa9220d3a0 (try_compile: Add keyword-dispatched signature,
2022-09-02, v3.25.0-rc1~178^2) the `DoNotRunExecutable` code path may be
reached with no single source-file argument.  Do not assume it exists.

Fixes: #24295
 2023-01-12 11:04:16 -05:00
Brad King
e15253a94b Merge branch 'release-3.23' into release-3.24 2023-01-12 10:33:55 -05:00
Brad King
76ab7cb79f Merge branch 'backport-IntelLLVM-no-icpx-on-Windows' into release-3.24 
Merge-request: !8041
 2023-01-12 10:33:50 -05:00
Brad King
878e8d2f4a Merge branch 'backport-IntelLLVM-no-icpx-on-Windows' into release-3.23 
Merge-request: !8041
 2023-01-12 10:33:30 -05:00
Michael Hirsch
870d89627f Help: Clarify compiler id distinction between Intel Classic and IntelLLVM 2023-01-12 10:24:15 -05:00
Brad King
ea4cfb3b53 Merge branch 'backport-IntelLLVM-no-icpx-on-Windows' 2023-01-12 10:24:06 -05:00
Michael Hirsch
8834e4d6a5 IntelLLVM: Avoid finding not-yet-supported icpx on Windows 
Intel oneAPI 2023.0 added the `icpx` compiler front-end on Windows.
It uses a GNU-like command-line, and is not yet supported by CMake.
Avoid finding `icpx` as the CXX compiler on Windows until support
is added.

Fixes: #24266
Issue: #24314
 2023-01-12 10:23:38 -05:00
scivision
1bc9b0f256 FindMatlab: accommodate Matlab running under Rosetta 
fixes #24312
 2023-01-12 09:47:09 -05:00
Brad King
e4c281e451 Merge topic 'find-module-cleanup' 
7683f43215 Help: Move FindITK/FindVTK to deprecated list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !8040
 2023-01-12 09:31:34 -05:00
Brad King
a46a5aedee Merge topic 'bug/cuda-toolkit-support-arm64-sbsa' 
743d4181b4 FindCUDAToolkit: Support cross-compilation to sbsa-linux
e60fa80fbe FindCUDAToolkit: Handle CUDA::nvToolsExt not existing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8057
 2023-01-12 09:29:28 -05:00
Brad King
b82b39df93 Merge topic 'tutorial_step5_todo_typo_fix' 
91f6c808d0 Tutorial: Fix typo in step 5 todo statement

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8058
 2023-01-12 09:28:50 -05:00
Brad King
c8f42171f2 Merge topic 'cuda-12' 
4d90f65b24 CUDA: Update set of architectures supported by CUDA 12

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8031
 2023-01-12 09:28:05 -05:00
Brad King
64b7c16b21 Merge topic 'doc-configure_file' 
b64a69b6c4 Help: Fix typo in configure_file docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8053
 2023-01-12 09:27:19 -05:00
Brad King
ef2220bf88 Merge topic 'FindwxWindows-typos' 
256262876b FindwxWindows: Fix comment typos

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8052
 2023-01-12 09:26:35 -05:00
Brad King
f31bb28c78 Merge topic 'ctest-error-newlines' 
5e7a4ad1a1 ctest: Add missing newlines on several error messages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8047
 2023-01-12 09:25:18 -05:00
Brad King
44dfe0bc13 Merge topic 'string-improve' 
0ee984defa CTest: Use std::string arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8046
 2023-01-12 09:23:53 -05:00
Brad King
b09f2f25b7 Merge topic 'frontend-variant-always' 
e4fcdfa301 Set CMAKE_<LANG>_COMPILER_FRONTEND_VARIANT on single-variant compilers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8036
 2023-01-12 09:22:46 -05:00