mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-26 18:58:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
49,633 Commits 2 Branches 391 Tags
cd2f894052ea8191e21ec4997b2181c75f637ae9
Commit Graph

49633 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
cd2f894052 Merge branch 'release-3.17' into master 2020-09-01 09:11:26 -04:00
Brad King
e1dbb7c2d8 Merge branch 'release-3.18' 2020-09-01 09:09:30 -04:00
Brad King
94964b60a0 Merge topic 'automoc-depend-project-file' 
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
 2020-09-01 09:09:30 -04:00
Brad King
7da3c744e3 Merge topic 'automoc-depend-project-file' into release-3.18 
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
 2020-09-01 09:09:30 -04:00
Brad King
1e37ac64ce Merge branch 'release-3.18' 2020-09-01 09:08:07 -04:00
Brad King
cb70145b36 Merge topic 'UseSWIG-interface-option' into release-3.18 
d264685bee UseSWIG: Update option -interface usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5172
 2020-09-01 09:08:06 -04:00
Brad King
ec0d621e36 Merge topic 'UseSWIG-interface-option' 
d264685bee UseSWIG: Update option -interface usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5172
 2020-09-01 09:08:06 -04:00
Kitware Robot
8c833ff0e1 CMake Nightly Date Stamp 2020-09-01 00:01:10 -04:00
Brad King
65a1045d97 Merge topic 'cuda_docs_host_id' 
a57beabb78 Help: Reference CMAKE_CUDA_COMPILER_ID not CMAKE_CUDA_COMPILER

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5170
 2020-08-31 13:51:15 -04:00
Brad King
30fec0d8a8 Merge branch 'backport-3.17-automoc-depend-project-file' into release-3.17 
Merge-request: !5166
 2020-08-31 13:44:44 -04:00
Brad King
776059ef0f Merge branch 'backport-3.17-automoc-depend-project-file' 2020-08-31 13:10:31 -04:00
Joerg Bornemann
6b20bbd2dd AutoMoc: Restore support for re-running after project file changes 
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
 2020-08-31 13:07:23 -04:00
Brad King
fc0dfd41eb Merge topic 'llvm_rc_preprocessing_for_all_windows_clang_variants' 
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
 2020-08-31 12:54:50 -04:00
Brad King
eb7e20db39 Merge topic 'ExternalProject-test-download-timeout' 
beab8bc29a Tests: Add timeout on the RunCMake.ExternalProject download server

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5167
 2020-08-31 12:53:26 -04:00
Marc Chevrier
d264685bee UseSWIG: Update option -interface usage 
Option -interface must not be used if multiple SWIG files are part
of the same library.

Fixes: #21134
 2020-08-31 12:33:57 +02:00
Kitware Robot
5294febcaf CMake Nightly Date Stamp 2020-08-31 00:01:11 -04:00
Kitware Robot
e09bcd40da CMake Nightly Date Stamp 2020-08-30 00:01:07 -04:00
Raul Tambre
a57beabb78 Help: Reference CMAKE_CUDA_COMPILER_ID not CMAKE_CUDA_COMPILER 
We should refer to the compiler ID in the documentation to avoid users checking
compiler executable names, since that seems fragile.
 2020-08-29 13:26:25 +03:00
Kitware Robot
670672f10e CMake Nightly Date Stamp 2020-08-29 00:01:09 -04:00
Kitware Robot
c268e26d33 CMake Nightly Date Stamp 2020-08-28 00:01:25 -04:00
Thomas Bernard
0ccd256787 llvm-rc: Enable preprocessing for all Windows usage variants 
Fixes: #21096
 2020-08-27 12:25:59 -04:00
Thomas Bernard
7e72fe2ec9 llvm-rc: Refactor the preprocessing logic 2020-08-27 12:25:20 -04:00
Thomas Bernard
beab8bc29a Tests: Add timeout on the RunCMake.ExternalProject download server 
Fixes: #21132
 2020-08-27 12:09:32 -04:00
Brad King
15e2bbf71a Merge branch 'release-3.18' 2020-08-27 11:16:43 -04:00
Brad King
f2a22ecda9 Merge branch 'release-3.17' into release-3.18 2020-08-27 11:16:32 -04:00
Brad King
9aef5edf38 Merge branch 'release-3.17' 2020-08-27 11:14:38 -04:00
Brad King
9fbd3df21e Merge branch 'backport-3.17-cmext-vs16-declval' into release-3.17 
Merge-request: !4971
 2020-08-27 11:13:20 -04:00
Sumit Bhardwaj
d2f891288a Implement cm::static_reference_cast by declval 
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.
 2020-08-27 11:12:25 -04:00
Brad King
86dd85d832 Merge topic 'ctest-FATAL_ERROR' 
6a6f1d1edd CTest: exit nonzero after message(SEND_ERROR|FATAL_ERROR)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5154
 2020-08-27 09:10:05 -04:00
Kitware Robot
e99132494b CMake Nightly Date Stamp 2020-08-27 00:01:15 -04:00
Kevin Puetz
6a6f1d1edd CTest: exit nonzero after message(SEND_ERROR|FATAL_ERROR) 
Fixes: #21004
 2020-08-26 11:27:05 -04:00
Brad King
efdd143459 Merge topic 'vs-win-sdk-custom-max' 
ba497111f6 VS: Add option for custom Win10 SDK version maximum

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5150
 2020-08-26 10:28:07 -04:00
Brad King
807aaae4ac Merge topic 'FindJNI-arm64' into release-3.18 
44dffbcc94 FindJNI: Add arm64 support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5162
 2020-08-26 10:26:52 -04:00
Brad King
ff92b0e64c Merge branch 'release-3.18' 2020-08-26 10:26:52 -04:00
Brad King
65856616d7 Merge topic 'FindJNI-arm64' 
44dffbcc94 FindJNI: Add arm64 support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5162
 2020-08-26 10:26:52 -04:00
Brad King
57c1be6e15 Merge topic 'cuda-std-for-msvc' into release-3.18 
bed315a0da CUDA: Support setting CUDA14/17 when using MSVC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5160
 2020-08-26 10:25:44 -04:00
Brad King
cd03fb126e Merge branch 'release-3.18' 2020-08-26 10:25:44 -04:00
Brad King
bf0262f41e Merge topic 'cuda-std-for-msvc' 
bed315a0da CUDA: Support setting CUDA14/17 when using MSVC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5160
 2020-08-26 10:25:44 -04:00
Kitware Robot
ee70fe416f CMake Nightly Date Stamp 2020-08-26 00:02:20 -04:00
jonathan molinatto
ba497111f6 VS: Add option for custom Win10 SDK version maximum 
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
 2020-08-25 15:27:38 -04:00
Malcolm Parsons
44dffbcc94 FindJNI: Add arm64 support 
On 64-bit ARM, JVM directories have an arm64 suffix.
 2020-08-25 14:34:02 -04:00
Brad King
4767548733 Merge topic 'automoc_timestamp_nmc_fix' into release-3.18 
a48bb185c3 AutoGen: Fix moc and uic dependencies when building Qt itself

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5153
 2020-08-25 13:58:28 -04:00
Brad King
675be013e9 Merge branch 'release-3.18' 2020-08-25 13:58:28 -04:00
Brad King
979a5bd4d1 Merge topic 'automoc_timestamp_nmc_fix' 
a48bb185c3 AutoGen: Fix moc and uic dependencies when building Qt itself

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5153
 2020-08-25 13:58:28 -04:00
Alexandru Croitor
a48bb185c3 AutoGen: Fix moc and uic dependencies when building Qt itself 
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
 2020-08-25 12:29:23 -04:00
Brad King
5e212cafba Merge topic 'osx_asm_architectures' 
940fc62962 macOS: Respect OSX_ARCHITECTURES for ASM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5152
 2020-08-25 10:40:20 -04:00
Brad King
f035ddec4f Merge topic 'win32-executable-genex' 
3ef0c40962 WIN32_EXECUTABLE: Add support for generator expressions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5146
 2020-08-25 10:33:00 -04:00
Brad King
ea67dbc4cd Merge topic 'file_generate_target' 
27a912193b file(GENERATE): Add TARGET argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5131
 2020-08-25 10:31:02 -04:00
Brad King
0b0dc86eab Merge topic 'unk_imported_location' 
359c500a24 cmTarget: Raise error if imported target location is not set

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5113
 2020-08-25 10:30:14 -04:00
Brad King
a65f95bb65 Merge topic 'update-curl' 
387ea71853 curl: Set build options the way we need for CMake
7d0fa4a943 Merge branch 'upstream-curl' into update-curl
7ceb56989f curl 2020-08-19 (9d954e49)
c156948327 curl: Update script to get curl 7.72.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5143
 2020-08-25 10:28:19 -04:00