mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-08 23:00:07 -06:00
Code Issues Packages Projects Releases Wiki Activity
49,612 Commits 2 Branches 385 Tags
670672f10e8b720d42b44fad80472805efa9ec00
Commit Graph

49612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Brad King
d2c3dea64b Merge topic 'msvc_static_assert' into release-3.18 
95bc11dbb4 MSVC: Record support for c_static_assert

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5148
 2020-08-25 10:26:54 -04:00
Brad King
7e7c7fdb7f Merge branch 'release-3.18' 2020-08-25 10:26:54 -04:00
Brad King
4294526504 Merge topic 'msvc_static_assert' 
95bc11dbb4 MSVC: Record support for c_static_assert

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5148
 2020-08-25 10:26:54 -04:00
Kitware Robot
d9aa99dd54 CMake Nightly Date Stamp 2020-08-25 00:01:11 -04:00
Craig Scott
9e61327d03 Merge topic 'fetchcontent-source-dir' 
b972e25276 FetchContent: Fix SOURCE_DIR, BUILD_DIR when disconnected or overridden

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5156
 2020-08-24 18:29:13 -04:00
Craig Scott
353d266a72 Merge topic 'known_features_docs' 
268fcc2782 Help: Separate C++ compile feature by standard

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5151
 2020-08-24 18:23:58 -04:00
Robert Maynard
bed315a0da CUDA: Support setting CUDA14/17 when using MSVC 
Fixes #20953
 2020-08-24 09:53:38 -04:00
Kitware Robot
6db6913eec CMake Nightly Date Stamp 2020-08-24 00:01:17 -04:00
Craig Scott
b972e25276 FetchContent: Fix SOURCE_DIR, BUILD_DIR when disconnected or overridden 
Fixes: #21123
 2020-08-23 18:38:47 +10:00
Kitware Robot
269d1a8624 CMake Nightly Date Stamp 2020-08-23 00:01:09 -04:00
Francisco Pombal
268fcc2782 Help: Separate C++ compile feature by standard 
Additionally, mention that no fine-grained features are available for
C++ 17 and beyond.

Co-Authored-By: Craig Scott <craig.scott@crascit.com>
 2020-08-23 13:49:40 +10:00
Raul Tambre
940fc62962 macOS: Respect OSX_ARCHITECTURES for ASM 
Fixes #20771.
 2020-08-22 09:16:21 +03:00
Kitware Robot
08170b1b57 CMake Nightly Date Stamp 2020-08-22 00:01:14 -04:00
Brad King
6cbaa8eb93 Merge topic 'clang-cl-restore-preprocess' 
7b083d59c2 clang-cl: Restore rules to create preprocessed and assembly output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5142
 2020-08-21 09:31:08 -04:00
Kyle Edwards
3ef0c40962 WIN32_EXECUTABLE: Add support for generator expressions 2020-08-21 09:17:27 -04:00
Raul Tambre
359c500a24 cmTarget: Raise error if imported target location is not set 
Previously we would synthesize <TARGET_NAME>-NOTFOUND as the location. This
would then end up on the link line and cause build failures.
Policy CMP0110 is added to control this behaviour.

Fixes #19080, #19943.
 2020-08-21 08:38:39 -04:00
Kitware Robot
692bc2de94 CMake Nightly Date Stamp 2020-08-21 00:01:09 -04:00
Raul Tambre
27a912193b file(GENERATE): Add TARGET argument 
Adds TARGET argument to file(GENERATE) to make resolving generator expressions
requiring a target possible.

Implements #21101, fixes #21074.
 2020-08-20 17:41:52 +03:00
Raul Tambre
95bc11dbb4 MSVC: Record support for c_static_assert 
Supported since MSVC 19.28.29115 (VS 16.8.0 Preview 1.0).
 2020-08-20 09:45:47 -04:00
Brad King
8de3a25ec3 Merge branch 'release-3.18' 2020-08-20 09:21:33 -04:00
Brad King
aaa5eab410 CMake 3.18.2 v3.18.2 2020-08-20 08:20:32 -04:00