Josef Angstenberger authored 4 years ago and Brad King committed 4 years ago

Since commit 36ded610 (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 f1fb63b3 (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

Brad King authored 4 years ago and Kitware Robot committed 4 years ago

f6a80ffd gitlab-ci: Prefer MR rules for any pipeline associated with a MR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5214

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.

Brad King authored 4 years ago and Kitware Robot committed 4 years ago

9ac3503d AutoMoc: Re-run moc if a dependency is missing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5180

Brad King authored 4 years ago and Kitware Robot committed 4 years ago

ce7c1005 PCH: Fix 30s wait for VS2008 when used via -Tv90

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5199

Brad King authored 4 years ago and Kitware Robot committed 4 years ago

8d61294c PCH: Mark CMake PCH source files as -x <lang>-header

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5188

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

Brad King authored 4 years ago and Kitware Robot committed 4 years ago

0670797d FindPython: CMP0012 must be set to NEW

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5198

Fixes: #21142
Backport: release

Fixes: #21168

Fixes: #21163

Brad King authored 4 years ago and Kitware Robot committed 4 years ago

a9fd3a10 Ninja Multi-Config: Fix dependencies of utility targets
f1199bdc Ninja Multi-Config: Fix cleaning of utility targets with commands
657047cd Ninja Multi-Config: Fix clean:all target
c35d1927 Tests: Pass additional Qt information to Ninja and NMC tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5177

Brad King authored 4 years ago and Kitware Robot committed 4 years ago

6fdfe242 FindPython: enhance ABI checks against include directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5181

Fixes: #21118

Fixes: #21149

Brad King authored 4 years ago and Kitware Robot committed 4 years ago

776059ef Merge branch 'backport-3.17-automoc-depend-project-file'
6b20bbd2 AutoMoc: Restore support for re-running after project file changes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5166

Brad King authored 4 years ago and Kitware Robot committed 4 years ago

d264685b UseSWIG: Update option -interface usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5172

Jörg Bornemann authored 4 years ago and Brad King committed 4 years ago

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 aebfbcaa
(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

Option -interface must not be used if multiple SWIG files are part
of the same library.

Fixes: #21134

Merge-request: !4971

Sumit Bhardwaj authored 4 years ago and Brad King committed 4 years ago

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.

Brad King authored 4 years ago and Kitware Robot committed 4 years ago

44dffbcc FindJNI: Add arm64 support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5162

Brad King authored 4 years ago and Kitware Robot committed 4 years ago

bed315a0 CUDA: Support setting CUDA14/17 when using MSVC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5160

Malcolm Parsons authored 4 years ago and Brad King committed 4 years ago

On 64-bit ARM, JVM directories have an arm64 suffix.

Brad King authored 4 years ago and Kitware Robot committed 4 years ago

a48bb185 AutoGen: Fix moc and uic dependencies when building Qt itself

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5153

alcroito authored 4 years ago and Brad King committed 4 years ago

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

Brad King authored 4 years ago and Kitware Robot committed 4 years ago

95bc11db MSVC: Record support for c_static_assert

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5148

Fixes #20953

Raul Tambre authored 4 years ago and Brad King committed 4 years ago

Supported since MSVC 19.28.29115 (VS 16.8.0 Preview 1.0).

Brad King authored 4 years ago and Kitware Robot committed 4 years ago

47abe5f2 FindMPI: Fix regression in pthread guard

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5147

Brad King authored 4 years ago and Kitware Robot committed 4 years ago

983cb0c8 gitlab-ci: Update Windows builds to MSVC 19.27

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5144

Brad King authored 4 years ago and Kitware Robot committed 4 years ago

f4373fed Tests: Fix RunCMake.try_compile test for C standards with MSVC 19.27

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5145

Axel Huebl authored 4 years ago and Brad King committed 4 years ago

Fix a regression with MPI and CUDA<10.2 that did let `-pthread` flags
slip to nvcc again.  In commit b725a190 (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