summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | ISPC: Support ISPC header generation byproducts and parallel buildsRobert Maynard2020-08-2830-39/+343
| | | | | | | |
| * | | | | | | Add ISPC compiler support to CMakeRobert Maynard2020-08-2832-7/+621
| | | | | | | |
| * | | | | | | Refactor some swift only logic to be re-used by other languagesRobert Maynard2020-08-071-26/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic in AddSwiftInterfaceIncludeDirectories is something that other languages will want going forward
* | | | | | | | Merge branch 'release-3.17' into masterBrad King2020-09-010-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'backport-3.17-automoc-depend-project-file' into release-3.17Brad King2020-08-319-1/+150
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !5166
* | \ \ \ \ \ \ \ \ Merge branch 'release-3.18'Brad King2020-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge topic 'automoc-depend-project-file' into release-3.18Brad King2020-09-019-1/+150
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 776059ef0f Merge branch 'backport-3.17-automoc-depend-project-file' 6b20bbd2dd AutoMoc: Restore support for re-running after project file changes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5166
* | \ \ \ \ \ \ \ \ \ Merge topic 'automoc-depend-project-file'Brad King2020-09-019-1/+150
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 776059ef0f Merge branch 'backport-3.17-automoc-depend-project-file' 6b20bbd2dd AutoMoc: Restore support for re-running after project file changes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5166
| * | | | | | | | | | Merge branch 'backport-3.17-automoc-depend-project-file'Brad King2020-08-319-1/+150
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | AutoMoc: Restore support for re-running after project file changesJoerg Bornemann2020-08-319-1/+150
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Qt >= 5.15.0 and Ninja generators AutoMoc creates a depfile to let Ninja decide when to run AutoMoc. This was introduced by commit aebfbcaa46 (AutoGen: Use depfiles for the XXX_autogen ninja targets, 2020-01-14, v3.17.0-rc1~58^2). However, AutoMoc was not triggered after adding a new moc-able file to the project. This patch adds the project file (and potentially included files) to the dependencies in the depfile. Now, a re-run of AutoMoc is triggered if the project file changes. Fixes: #21127
* | | | | | | | | | Merge branch 'release-3.18'Brad King2020-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'UseSWIG-interface-option' into release-3.18Brad King2020-09-019-1/+71
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d264685bee UseSWIG: Update option -interface usage Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5172
* | | | | | | | | | Merge topic 'UseSWIG-interface-option'Brad King2020-09-019-1/+71
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d264685bee UseSWIG: Update option -interface usage Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5172
| * | | | | | | | | UseSWIG: Update option -interface usageMarc Chevrier2020-08-319-1/+71
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Option -interface must not be used if multiple SWIG files are part of the same library. Fixes: #21134
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-09-011-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'cuda_docs_host_id'Brad King2020-08-311-6/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a57beabb78 Help: Reference CMAKE_CUDA_COMPILER_ID not CMAKE_CUDA_COMPILER Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5170
| * | | | | | | | | Help: Reference CMAKE_CUDA_COMPILER_ID not CMAKE_CUDA_COMPILERRaul Tambre2020-08-291-6/+6
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should refer to the compiler ID in the documentation to avoid users checking compiler executable names, since that seems fragile.
* | | | | | | | | Merge topic 'llvm_rc_preprocessing_for_all_windows_clang_variants'Brad King2020-08-311-20/+29
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0ccd256787 llvm-rc: Enable preprocessing for all Windows usage variants 7e72fe2ec9 llvm-rc: Refactor the preprocessing logic Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5163
| * | | | | | | | | llvm-rc: Enable preprocessing for all Windows usage variantsThomas Bernard2020-08-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21096
| * | | | | | | | | llvm-rc: Refactor the preprocessing logicThomas Bernard2020-08-271-20/+27
| | | | | | | | | |
* | | | | | | | | | Merge topic 'ExternalProject-test-download-timeout'Brad King2020-08-311-5/+12
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | beab8bc29a Tests: Add timeout on the RunCMake.ExternalProject download server Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5167
| * | | | | | | | | Tests: Add timeout on the RunCMake.ExternalProject download serverThomas Bernard2020-08-271-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21132
* | | | | | | | | | CMake Nightly Date StampKitware Robot2020-08-311-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2020-08-301-1/+1
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-08-291-1/+1
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-08-281-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'release-3.18'Brad King2020-08-270-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'release-3.17' into release-3.18Brad King2020-08-270-0/+0
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
* | | | | | | | Merge branch 'release-3.17'Brad King2020-08-270-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'backport-3.17-cmext-vs16-declval' into release-3.17Brad King2020-08-271-8/+9
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4971
| | * | | | | | | Implement cm::static_reference_cast by declvalSumit Bhardwaj2020-08-271-8/+9
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, cm::static_reference_cast used invoke_result_t and took the address of O::get. This is not in complete conformance with standard. This MR changes the implementation to use std::declval<O>.get() which is always well-defined.
* | | | | | | | Merge topic 'ctest-FATAL_ERROR'Brad King2020-08-2718-15/+57
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a6f1d1edd CTest: exit nonzero after message(SEND_ERROR|FATAL_ERROR) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5154
| * | | | | | | | CTest: exit nonzero after message(SEND_ERROR|FATAL_ERROR)Kevin Puetz2020-08-2618-15/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21004
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-08-271-1/+1
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge topic 'vs-win-sdk-custom-max'Brad King2020-08-269-10/+70
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ba497111f6 VS: Add option for custom Win10 SDK version maximum Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5150
| * | | | | | | | VS: Add option for custom Win10 SDK version maximumjonathan molinatto2020-08-259-10/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 83ddc4d289 (VS: Do not select a Windows SDK too high for current VS version, 2017-08-07, v3.13.0-rc1~72^2~2) we enforce a maximum SDK version for the VS 2015 generator. The blog post linked in the original commit is no longer available, but it can be seen here: * https://web.archive.org/web/20190108032520/https://blogs.msdn.microsoft.com/chuckw/2018/10/02/windows-10-october-2018-update/ In particular, it states: > VS 2015 Users: The Windows 10 SDK (15063, 16299, 17134, 17763) > is officially only supported for VS 2017. However, in some circumstances a higher version can be used. Add a `CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM` to override the generator's default maximum SDK version. Fixes: #20633
* | | | | | | | | Merge branch 'release-3.18'Brad King2020-08-260-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'FindJNI-arm64' into release-3.18Brad King2020-08-261-0/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 44dffbcc94 FindJNI: Add arm64 support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5162
* | \ \ \ \ \ \ \ \ Merge topic 'FindJNI-arm64'Brad King2020-08-261-0/+2
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 44dffbcc94 FindJNI: Add arm64 support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5162
| * | | | | | | | | FindJNI: Add arm64 supportMalcolm Parsons2020-08-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On 64-bit ARM, JVM directories have an arm64 suffix.
* | | | | | | | | | Merge branch 'release-3.18'Brad King2020-08-260-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'cuda-std-for-msvc' into release-3.18Brad King2020-08-261-4/+6
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bed315a0da CUDA: Support setting CUDA14/17 when using MSVC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5160
* | \ \ \ \ \ \ \ \ \ Merge topic 'cuda-std-for-msvc'Brad King2020-08-261-4/+6
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bed315a0da CUDA: Support setting CUDA14/17 when using MSVC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5160
| * | | | | | | | | | CUDA: Support setting CUDA14/17 when using MSVCRobert Maynard2020-08-241-4/+6
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #20953
* | | | | | | | | | CMake Nightly Date StampKitware Robot2020-08-261-1/+1
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge branch 'release-3.18'Brad King2020-08-250-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'automoc_timestamp_nmc_fix' into release-3.18Brad King2020-08-251-0/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a48bb185c3 AutoGen: Fix moc and uic dependencies when building Qt itself Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5153
* | \ \ \ \ \ \ \ \ Merge topic 'automoc_timestamp_nmc_fix'Brad King2020-08-251-0/+4
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | a48bb185c3 AutoGen: Fix moc and uic dependencies when building Qt itself Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5153
| * | | | | | | | AutoGen: Fix moc and uic dependencies when building Qt itselfAlexandru Croitor2020-08-251-0/+4
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building Qt itself, the moc and uic executables are spcecified via a generator expression of the form $<TARGET_FILE:Qt6::moc>, which ends populating Moc's and Uic's 'Executable' field but not the ExecutableTarget and ExecutableTargetName fields. In such a scenario, the code in cmQtAutoGenInitializer::InitAutogenTarget fails to add a dependency on moc (or uic), because ExecutableTarget is null. First try to add a dependency on the ExecutableTarget if it's not empty, otherwise try to add a dependency on the path specified in the 'Executable' field. Issue: #21118
* | | | | | | | Merge topic 'osx_asm_architectures'Brad King2020-08-252-2/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 940fc62962 macOS: Respect OSX_ARCHITECTURES for ASM Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5152
generated by cgit v0.12 at 2025-09-08 01:01:49 (GMT)