summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* GeneratorExpression Tests: Remove duplicate test entryRobert Maynard2023-01-171-1/+0
|
* Merge branch 'release-3.25'Brad King2023-01-170-0/+0
|\
| * Merge branch 'backport-FindCUDAToolkit-cuda-12-nvToolsExt' into release-3.25Brad King2023-01-171-1/+1
| |\ | | | | | | | | | Merge-request: !8076
| | * FindCUDAToolkit: Handle CUDA::nvToolsExt not existingRobert Maynard2023-01-161-1/+1
| | | | | | | | | | | | Fixes #24275
* | | Merge topic 'configure-log'Brad King2023-01-1727-23/+265
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | try_compile: Record stack of in-progess checks in configure logBrad King2023-01-1613-0/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | try_compile: Add a NO_LOG option to skip recording in the configure logBrad King2023-01-169-4/+32
| | | |
| * | | try_compile: Add optional LOG_DESCRIPTION to record in configure logBrad King2023-01-1616-0/+64
| | | | | | | | | | | | | | | | Issue: #23200
| * | | try_compile: Report underlying error when COPY_FILE failsBrad King2023-01-161-12/+24
| | | |
| * | | Tests: Add explicit ConfigureLog case to RunCMake.try_compileBrad King2023-01-165-0/+60
| | | |
| * | | cmake: Make entire in-progress check stack available internallyBrad King2023-01-161-5/+4
| | | | | | | | | | | | | | | | Represent it as a `vector` so we can iterate over the whole stack.
| * | | Help: Clarify backtrace order in cmake-configure-log(7)Brad King2023-01-131-2/+3
| | | |
* | | | Merge topic 'ctest-no-tests-action-env-var'Brad King2023-01-1714-0/+63
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | ctest(1): Add CTEST_NO_TESTS_ACTION env varfriendlyanon2023-01-1314-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | This environment variable provides a default value for the --no-tests=<action> command line argument.
* | | | | Merge branch 'release-3.25'Brad King2023-01-170-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'release-3.24' into release-3.25Brad King2023-01-170-0/+0
| |\ \ \ \
* | \ \ \ \ Merge branch 'release-3.24'Brad King2023-01-170-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'doc-header-only' into release-3.24Brad King2023-01-131-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !8071
* | \ \ \ \ \ Merge branch 'release-3.25'Brad King2023-01-170-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge topic 'doc-header-only' into release-3.25Brad King2023-01-171-1/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | / | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | 93696d0f2e Help: Restore cmake-buildsystem(7) header-only library example Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8071
* | | | | | Merge topic 'doc-header-only'Brad King2023-01-171-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 93696d0f2e Help: Restore cmake-buildsystem(7) header-only library example Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8071
| * | | | | Help: Restore cmake-buildsystem(7) header-only library exampleBrad King2023-01-131-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | CMake Nightly Date StampKitware Robot2023-01-171-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2023-01-161-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2023-01-151-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2023-01-141-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'vs-masm-flags'Brad King2023-01-133-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 81f670fa83 VS: Honor compile options for MASM Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8068
| * | | | VS: Honor compile options for MASMBrad King2023-01-123-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge topic 'FindMatlab-macos-rosetta'Brad King2023-01-131-32/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1bc9b0f256 FindMatlab: accommodate Matlab running under Rosetta 8dcd14bb87 FindMatlab: simplify mexext find logic Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8063
| * | | | | FindMatlab: accommodate Matlab running under Rosettascivision2023-01-121-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | fixes #24312
| * | | | | FindMatlab: simplify mexext find logicscivision2023-01-121-19/+3
| | | | | | | | | | | | | | | | | | | | | | | | This eliminates an explicit for() loop
* | | | | | Merge topic 'fea/add-copy_directory_if_different'Brad King2023-01-134-3/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c1170b5602 cmake: Add -E copy_directory_if_different Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8059
| * | | | | | cmake: Add -E copy_directory_if_differentRobert Maynard2023-01-124-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #21584
* | | | | | | Merge topic 'deprecate-findunixcmds'Brad King2023-01-132-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0847682c47 FindUnixCommands: Deprecate in favor of cmake -E Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8061
| * | | | | | | FindUnixCommands: Deprecate in favor of cmake -EFeRD (Frank Dana)2023-01-122-1/+5
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `${CMAKE_COMMAND} -E` subcommands are cross-platform replacements. Fixes: #24263
* | | | | | | Merge branch 'release-3.25'Brad King2023-01-130-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge topic 'try_run-cross-compile' into release-3.25Brad King2023-01-133-6/+18
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ \ \ \ Merge topic 'try_run-cross-compile'Brad King2023-01-133-10/+28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ \ \ Merge branch 'backport-try_run-cross-compile' into try_run-cross-compileBrad King2023-01-123-6/+18
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | try_run: Avoid crash in keyword-dispatched signature when cross-compilingBrad King2023-01-123-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | try_run: Do not require unrequested stdout/stderr when cross-compilingBrad King2023-01-121-4/+10
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge branch 'release-3.25'Brad King2023-01-130-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge topic 'implicit-includes' into release-3.25Brad King2023-01-133-6/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ \ \ \ \ Merge topic 'implicit-includes'Brad King2023-01-133-6/+7
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Restore implicit include directory extraction for adaptive relative pathsBrad King2023-01-123-6/+7
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge branch 'release-3.25'Brad King2023-01-130-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'IntelLLVM-msvc-no-cxx11' into release-3.25Brad King2023-01-131-2/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 88f9fdcb03 IntelLLVM: Avoid unnecessary -Qstd=c++11 flag on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8069
* | \ \ \ \ \ \ \ Merge topic 'IntelLLVM-msvc-no-cxx11'Brad King2023-01-131-2/+2
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 88f9fdcb03 IntelLLVM: Avoid unnecessary -Qstd=c++11 flag on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8069
| * | | | | | | | IntelLLVM: Avoid unnecessary -Qstd=c++11 flag on WindowsBrad King2023-01-121-2/+2
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge branch 'release-3.25'Brad King2023-01-130-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |