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

Since commit f7347f28 (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.

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

71532474 ExternalProject: Stop configure target from always appearing out-of-date
c0b7198a ExternalProject: Stop patch target from always appearing out-of-date

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

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

3937536d llvm-rc: Fix quoting of path to cmake in CMAKE_RC_COMPILE_OBJECT

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

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

72822e26 FindPython: enhance robustness of version extraction from library name

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

6896e509 CMakeFindBinUtils: Always consider plain binutils when not cross-compiling

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

Thomas Bernard authored 4 years ago and Brad King committed 4 years ago

When the installation path to cmake includes spaces, the
`<CMAKE_COMMAND>` is required to have proper quotation of the cmake
call.

Fixes: #21095

Robert Maynard authored 4 years ago and Brad King committed 4 years ago

Since commit c5dd2ca5 (DetermineCompiler: Relax
_CMAKE_TOOLCHAIN_PREFIX detection, 2020-03-25, v3.18.0-rc1~430^2),
`_CMAKE_TOOLCHAIN_PREFIX` may be set even when not cross-compiling.
In this case we may still need to use binutils without any prefix.

Fixes: #21103

When updates are disconnected, don't depend on skip-update because that
target is always considered out of date. Depend directly on the patch target
instead because it already depends on the appropriate target regardless of
whether updates are disconnected or not. This in turn means nothing depends
on the skip-update target, so it has also been removed.

Relates: #21086

The skip-update target is always considered out-of-date. The change in
7249ba96 (ExternalProject: Enforce that patch depends on update, 2020-04-03)
made the patch target depend on skip-update, which in turn made it
always out of date too. The patch command should only be re-run if the download
needs to be performed again where updates are disconnected.

Fixes: #21086

Fixes: #21105