summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge branch 'backport-3.16-automoc-path-prefix-off' into release-3.16Brad King2020-09-151-5/+11
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Help: Add 3.16.9 release note about AUTOMOC_PATH_PREFIX default changeJoerg Bornemann2020-09-151-5/+11
| | | | |
| * | | | Merge branch 'backport-3.16-automoc-path-prefix-off' into release-3.16Brad King2020-08-104-5/+7
| |\ \ \ \ | | |/ / / | | | | | | | | | | Merge-request: !5105
| * | | | Merge branch 'backport-test-FindPkgConfig-isolate-env' into release-3.16Brad King2020-08-071-0/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !5108
* | \ \ \ \ Merge topic 'armclang-fixes' into release-3.18Brad King2020-09-111-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3d1ed986e2 ARMClang: Fix link line generation after addition of armlink support Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Osama Moharam <osama.moharam.uw@renesas.com> Merge-request: !5211
| * | | | | | ARMClang: Fix link line generation after addition of armlink supportMarc Chevrier2020-09-101-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise logic added by commit 73fb6ac82b (ARMClang: Add support for armlink, 2020-06-02, v3.18.0-rc1~27^2). Fixes: #21154
* | | | | | | Merge topic 'file-GENERATE-earlier' into release-3.18Brad King2020-09-111-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aee2c51224 file(GENERATE): Create output file structures for all directories first Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5209
| * | | | | | file(GENERATE): Create output file structures for all directories firstJosef Angstenberger2020-09-101-0/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 36ded610af (PCH: Generate sources during Compute step, 2019-10-05, v3.16.0-rc1~2^2) the source file lookup is done earlier than before. Its parent commit f1fb63b306 (file(GENERATE): Create output file structures even earlier, 2019-10-07, v3.16.0-rc1~2^2~1) prepared for that. However, that commit did not account for generating and using files in separate subdirectories. Fix this by evaluating all generated files before adding automatic files. Fixes: #21144
* | | | | | Merge topic 'gitlab-ci-prefer-mr' into release-3.18Brad King2020-09-101-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6a80ffd54 gitlab-ci: Prefer MR rules for any pipeline associated with a MR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5214
| * | | | | | gitlab-ci: Prefer MR rules for any pipeline associated with a MRBrad King2020-09-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab 13.3 started creating MR pipelines in the parent project of a MR from a fork, at least when the MR submitter is a developer in the parent project. If the pipeline is associated with a MR, we should use the corresponding rules regardless of which project hosts the pipeline.
* | | | | | | Merge topic 'automoc-rerun-missing-dependency' into release-3.18Brad King2020-09-109-7/+132
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ac3503d30 AutoMoc: Re-run moc if a dependency is missing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5180
| * | | | | | | AutoMoc: Re-run moc if a dependency is missingJoerg Bornemann2020-09-099-7/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AutoMoc uses the moc-emitted dependency file of Qt 5.15 to track dependencies. Such a dependency may well live outside the project and can vanish, for example when installing a new compiler version. This situation was detected before, but merely a warning was issued. Now, we're considering a generated file as out of date if a dependency is missing and re-generate it. We also have to remove the missing dependency from the ParseCache. Otherwise the AUTOMOC target for all generators other than Ninja will always be out of date. The ParseCacheChanged flag had to be made atomic, because we're potentially accessing it from multiple threads. The dependencies vector itself is not vulnerable in this regard, because there's one vector per file, and we're accessing exactly one ParseCacheT::FileHandleT per thread. Fixes: #21136
* | | | | | | | Merge topic 'pch-tv90' into release-3.18Brad King2020-09-091-8/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ce7c100545 PCH: Fix 30s wait for VS2008 when used via -Tv90 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5199
| * | | | | | | | PCH: Fix 30s wait for VS2008 when used via -Tv90Cristian Adam2020-09-071-8/+20
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21142 Backport: release
* | | | | | | | Merge topic 'ios-pch-x-lang-header' into release-3.18Brad King2020-09-094-4/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d61294c3e PCH: Mark CMake PCH source files as -x <lang>-header Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5188
| * | | | | | | | PCH: Mark CMake PCH source files as -x <lang>-headerCristian Adam2020-09-044-4/+19
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21163
* | | | | | | | Merge topic 'FindPython-set-CMP0012-NEW' into release-3.18Brad King2020-09-081-1/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0670797d71 FindPython: CMP0012 must be set to NEW Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5198
| * | | | | | | FindPython: CMP0012 must be set to NEWMarc Chevrier2020-09-071-1/+11
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes: #21168
* | | | | | | Merge topic 'ninja-multi-automoc-regression' into release-3.18Brad King2020-09-039-5/+39
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9fd3a107d Ninja Multi-Config: Fix dependencies of utility targets f1199bdc96 Ninja Multi-Config: Fix cleaning of utility targets with commands 657047cd24 Ninja Multi-Config: Fix clean:all target c35d1927a5 Tests: Pass additional Qt information to Ninja and NMC tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5177
| * | | | | | | Ninja Multi-Config: Fix dependencies of utility targetsKyle Edwards2020-09-026-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21118
| * | | | | | | Ninja Multi-Config: Fix cleaning of utility targets with commandsKyle Edwards2020-09-021-0/+2
| | | | | | | |
| * | | | | | | Ninja Multi-Config: Fix clean:all targetKyle Edwards2020-09-021-0/+1
| | | | | | | |
| * | | | | | | Tests: Pass additional Qt information to Ninja and NMC testsKyle Edwards2020-09-013-3/+4
| | | | | | | |
* | | | | | | | Merge topic 'FindPython-include-dir-ABI-checks' into release-3.18Brad King2020-09-031-8/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6fdfe2428d FindPython: enhance ABI checks against include directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5181
| * | | | | | | FindPython: enhance ABI checks against include directoryMarc Chevrier2020-09-021-8/+18
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes: #21149
* | | | | | | 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 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 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
| * | | | | | 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
* | | | | | Merge branch 'release-3.17' into release-3.18Brad 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 branch 'backport-3.17-automoc-path-prefix-off' into release-3.17Brad King2020-08-104-5/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !5105
* | \ \ \ \ \ 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
| * | | | | | | FindJNI: Add arm64 supportMalcolm Parsons2020-08-251-0/+2
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | On 64-bit ARM, JVM directories have an arm64 suffix.
* | | | | | | 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
| * | | | | | | CUDA: Support setting CUDA14/17 when using MSVCRobert Maynard2020-08-241-4/+6
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes #20953
* | | | | | | 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
| * | | | | | | 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 'msvc_static_assert' into release-3.18Brad King2020-08-253-6/+15
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95bc11dbb4 MSVC: Record support for c_static_assert Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5148
| * | | | | | MSVC: Record support for c_static_assertRaul Tambre2020-08-203-6/+15
|/ / / / / / | | | | | | | | | | | | | | | | | | Supported since MSVC 19.28.29115 (VS 16.8.0 Preview 1.0).
* | | | | | CMake 3.18.2v3.18.2Brad King2020-08-201-1/+1
| | | | | |
* | | | | | Merge topic 'FindMPI-cuda-pthread' into release-3.18Brad King2020-08-201-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 47abe5f225 FindMPI: Fix regression in pthread guard Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Raul Tambre <raul@tambre.ee> Merge-request: !5147
| * | | | | | FindMPI: Fix regression in pthread guardAxel Huebl2020-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a regression with MPI and CUDA<10.2 that did let `-pthread` flags slip to nvcc again. In commit b725a19072 (FindMPI: Deny -fexceptions from NVCC, 2020-07-02, v3.18.0-rc4~12^2) we accidentally forgot to use the variable containing the replacement result. Fixes: #21108
* | | | | | | Merge topic 'gitlab-ci-msvc-14.27' into release-3.18Brad King2020-08-201-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 983cb0c891 gitlab-ci: Update Windows builds to MSVC 19.27 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5144
| * | | | | | | gitlab-ci: Update Windows builds to MSVC 19.27Brad King2020-08-191-4/+4
| | | | | | | |
* | | | | | | | Merge topic 'msvc_c11' into release-3.18Brad King2020-08-201-0/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f4373feda8 Tests: Fix RunCMake.try_compile test for C standards with MSVC 19.27 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5145
| * | | | | | | Tests: Fix RunCMake.try_compile test for C standards with MSVC 19.27Brad King2020-08-191-0/+9
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit f7347f28c7 (MSVC: Record support for C11 and c_restrict, 2020-08-09) we know about MSVC C language standards. Update the `RunCMake.try_compile` test to be aware of this even when CMake is itself configured by an older CMake that does not know this.
* | | | | | | Merge topic 'ep-patch-skip-update-dep' into release-3.18Brad King2020-08-191-27/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 715324742f ExternalProject: Stop configure target from always appearing out-of-date c0b7198ad9 ExternalProject: Stop patch target from always appearing out-of-date Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5136
generated by cgit v0.12 at 2025-04-07 20:29:12 (GMT)