mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-07 14:50:15 -05:00
Code Issues Packages Projects Releases Wiki Activity
60,548 Commits 2 Branches 401 Tags
645671d36f5cf0fa411d98a637f4edbc3d896c57
Commit Graph

60548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 645671d36f Help: Document configure log behavior in try_compile and try_run 2023-01-18 11:37:02 -05:00
Brad King 45f86b9990 Merge topic 'configure-log' 
48292c8624 try_compile: Record stack of in-progess checks in configure log
d4bf7d80c6 try_compile: Add a NO_LOG option to skip recording in the configure log
9d9e8450a8 try_compile: Add optional LOG_DESCRIPTION to record in configure log
65ed5c2ca8 try_compile: Report underlying error when COPY_FILE fails
0418efb7ad Tests: Add explicit ConfigureLog case to RunCMake.try_compile
189557bd74 cmake: Make entire in-progress check stack available internally
96ce3581ab Help: Clarify backtrace order in cmake-configure-log(7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8072
 2023-01-17 09:26:50 -05:00
Brad King dd18be5ebf Merge topic 'ctest-no-tests-action-env-var' 
0661de58d8 ctest(1): Add CTEST_NO_TESTS_ACTION env var

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8044
 2023-01-17 09:18:04 -05:00
Brad King 99c6e032d6 Merge branch 'release-3.25' 2023-01-17 09:17:06 -05:00
Brad King 64100dd5ca Merge branch 'release-3.24' 2023-01-17 09:17:04 -05:00
Brad King 74da1d1a8f Merge branch 'release-3.24' into release-3.25 2023-01-17 09:16:54 -05:00
Brad King f58a820c59 Merge branch 'release-3.25' 2023-01-17 09:16:10 -05:00
Brad King fbb4886daf Merge topic 'doc-header-only' 
93696d0f2e Help: Restore cmake-buildsystem(7) header-only library example

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8071
 2023-01-17 09:16:09 -05:00
Brad King 4465e1ea31 Merge topic 'doc-header-only' into release-3.25 
93696d0f2e Help: Restore cmake-buildsystem(7) header-only library example

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8071
 2023-01-17 09:16:08 -05:00
Kitware Robot 304f133305 CMake Nightly Date Stamp 2023-01-17 00:01:07 -05:00
Brad King 48292c8624 try_compile: Record stack of in-progess checks in configure log 
Many `try_compile` and `try_run` calls occur inside check modules
between `message(CHECK_START)` and `message(CHECK_{PASS,FAIL})` pairs.
Add a field to configure log entries to report this context.

Issue: #23200
 2023-01-16 17:18:07 -05:00
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
Kitware Robot 87d28dd804 CMake Nightly Date Stamp 2023-01-16 00:01:26 -05:00
Kitware Robot 701badbd20 CMake Nightly Date Stamp 2023-01-15 00:01:05 -05:00
Kitware Robot 6aeafcffe6 CMake Nightly Date Stamp 2023-01-14 00:01:13 -05:00
Brad King 96ce3581ab Help: Clarify backtrace order in cmake-configure-log(7) 2023-01-13 13:21:41 -05:00
Brad King c0a8ffb008 Merge branch 'doc-header-only' into release-3.24 
Merge-request: !8071
 2023-01-13 10:45:15 -05:00
Brad King 93696d0f2e Help: Restore cmake-buildsystem(7) header-only library example 
Since commit 4391913133 (Add INTERFACE libraries to generated
buildsystem if they have SOURCES, 2020-07-20, v3.19.0-rc1~346^2~1) the
"Eigen" example in the `cmake-buildsystem(7)` manual is supposed to show
a header-only library in which the headers are attached as sources to be
edited in IDEs.  This was accidentally broken by commit 4b25a0d512
(Help/manual: Update header-only library example, 2022-04-22,
v3.24.0-rc1~220^2) when updating the example to use a `FILE_SET`.

Fixes: #24319
 2023-01-13 10:42:56 -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
friendlyanon 0661de58d8 ctest(1): Add CTEST_NO_TESTS_ACTION env var 
This environment variable provides a default value for the
--no-tests=<action> command line argument.
 2023-01-13 13:33:39 +01: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