summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmValue: Use operator* explicitly to convert to std::string; avoid extra callVitaly Stakhovsky2023-01-1626-99/+104
|
* 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
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'release-3.24' into release-3.25Brad King2023-01-130-0/+0
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'release-3.24'Brad King2023-01-130-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'release-3.23' into release-3.24Brad King2023-01-120-0/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'backport-IntelLLVM-no-icpx-on-Windows' into release-3.24Brad King2023-01-121-1/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !8041
* | \ \ \ \ \ \ \ Merge branch 'release-3.23'Brad King2023-01-130-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'backport-IntelLLVM-no-icpx-on-Windows' into release-3.23Brad King2023-01-121-1/+7
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | Merge-request: !8041
* | | | | | | | | Merge branch 'release-3.25'Brad King2023-01-130-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'IntelLLVM-no-icpx-on-Windows' into release-3.25Brad King2023-01-132-3/+10
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge topic 'IntelLLVM-no-icpx-on-Windows'Brad King2023-01-132-3/+10
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Help: Clarify compiler id distinction between Intel Classic and IntelLLVMMichael Hirsch2023-01-121-2/+3
| | | | | | | | |
| * | | | | | | | Merge branch 'backport-IntelLLVM-no-icpx-on-Windows'Brad King2023-01-121-1/+7
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | |
| | * | | | | | IntelLLVM: Avoid finding not-yet-supported icpx on WindowsMichael Hirsch2023-01-121-1/+7
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | CMake Nightly Date StampKitware Robot2023-01-131-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge topic 'find-module-cleanup'Brad King2023-01-121-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Help: Move FindITK/FindVTK to deprecated listFeRD (Frank Dana)2022-12-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both modules have actually been removed entirely, they exist in the Help directory only as "This module used to exist" placeholders.
* | | | | | | Merge topic 'bug/cuda-toolkit-support-arm64-sbsa'Brad King2023-01-122-19/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | FindCUDAToolkit: Support cross-compilation to sbsa-linuxRobert Maynard2023-01-112-18/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #24192
| * | | | | | | FindCUDAToolkit: Handle CUDA::nvToolsExt not existingRobert Maynard2023-01-111-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge topic 'tutorial_step5_todo_typo_fix'Brad King2023-01-121-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 91f6c808d0 Tutorial: Fix typo in step 5 todo statement Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8058
| * | | | | | | Tutorial: Fix typo in step 5 todo statementMarkus Ferrell2023-01-111-1/+1
| |/ / / / / /
* | | | | | | Merge topic 'cuda-12'Brad King2023-01-121-1/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d90f65b24 CUDA: Update set of architectures supported by CUDA 12 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8031
| * | | | | | | CUDA: Update set of architectures supported by CUDA 12xiny2023-01-111-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove architectures 35 and 37 for CUDA 12. Architecture 21 is not in CMAKE_CUDA_ARCHITECTURES_ALL_MAJOR so there is no need to remove it.
* | | | | | | | Merge topic 'doc-configure_file'Brad King2023-01-121-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b64a69b6c4 Help: Fix typo in configure_file docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8053