summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Xcode: Use "Link Binary With Libraries" build phase in some casesGusts Kaksis2020-08-3119-68/+508
| | | | | | | OBJECT and STATIC libraries (framework or non-framework) do not use this build phase. Not all items to be linked use this build phase either. Co-Authored-By: Craig Scott <craig.scott@crascit.com>
* Xcode: Add special case for file type extension map for .xcassetsGusts Kaksis2020-08-281-0/+3
|
* Xcode: Refactor build setting append code and attribute getter namingGusts Kaksis2020-08-284-51/+76
| | | | Support both STRING and OBJECT_LIST types in build setting attributes and make it possible to mix them
* CMake Nightly Date StampKitware Robot2020-08-281-1/+1
|
* Merge branch 'release-3.18'Brad King2020-08-270-0/+0
|\
| * Merge branch 'release-3.17' into release-3.18Brad King2020-08-270-0/+0
| |\
* | \ Merge branch 'release-3.17'Brad 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 topic 'ctest-FATAL_ERROR'Brad King2020-08-2718-15/+57
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 6a6f1d1edd CTest: exit nonzero after message(SEND_ERROR|FATAL_ERROR) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5154
| * | | CTest: exit nonzero after message(SEND_ERROR|FATAL_ERROR)Kevin Puetz2020-08-2618-15/+57
| | | | | | | | | | | | | | | | Fixes: #21004
* | | | CMake Nightly Date StampKitware Robot2020-08-271-1/+1
| | | |
* | | | Merge topic 'vs-win-sdk-custom-max'Brad King2020-08-269-10/+70
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ba497111f6 VS: Add option for custom Win10 SDK version maximum Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5150
| * | | | VS: Add option for custom Win10 SDK version maximumjonathan molinatto2020-08-259-10/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge branch 'release-3.18'Brad King2020-08-260-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | 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
* | \ \ \ \ Merge topic 'FindJNI-arm64'Brad 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 branch 'release-3.18'Brad King2020-08-260-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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
* | \ \ \ \ \ Merge topic 'cuda-std-for-msvc'Brad 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
* | | | | | CMake Nightly Date StampKitware Robot2020-08-261-1/+1
| | | | | |
* | | | | | Merge branch 'release-3.18'Brad King2020-08-250-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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
* | \ \ \ \ \ Merge topic 'automoc_timestamp_nmc_fix'Brad 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 'osx_asm_architectures'Brad King2020-08-252-2/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 940fc62962 macOS: Respect OSX_ARCHITECTURES for ASM Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5152
| * | | | | | macOS: Respect OSX_ARCHITECTURES for ASMRaul Tambre2020-08-222-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #20771.
* | | | | | | Merge topic 'win32-executable-genex'Brad King2020-08-2520-12/+118
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3ef0c40962 WIN32_EXECUTABLE: Add support for generator expressions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5146
| * | | | | | | WIN32_EXECUTABLE: Add support for generator expressionsKyle Edwards2020-08-2120-12/+118
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge topic 'file_generate_target'Brad King2020-08-2511-24/+79
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27a912193b file(GENERATE): Add TARGET argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5131
| * | | | | | | file(GENERATE): Add TARGET argumentRaul Tambre2020-08-2011-24/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds TARGET argument to file(GENERATE) to make resolving generator expressions requiring a target possible. Implements #21101, fixes #21074.
* | | | | | | | Merge topic 'unk_imported_location'Brad King2020-08-2526-12/+143
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 359c500a24 cmTarget: Raise error if imported target location is not set Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5113
| * | | | | | | | cmTarget: Raise error if imported target location is not setRaul Tambre2020-08-2126-12/+143
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge topic 'update-curl'Brad King2020-08-2556-419/+945
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | curl: Set build options the way we need for CMakeBrad King2020-08-191-1/+4
| | | | | | | | |
| * | | | | | | | Merge branch 'upstream-curl' into update-curlBrad King2020-08-1955-417/+940
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2020-08-19 (9d954e49)
| | * | | | | | | | curl 2020-08-19 (9d954e49)Curl Upstream2020-08-1955-416/+940
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit 9d954e49bce3706a9a2efb119ecd05767f0f2a9e (curl-7_72_0).
| * | | | | | | | | curl: Update script to get curl 7.72.0Brad King2020-08-191-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'release-3.18'Brad King2020-08-250-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | 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
* | | | | | | | | | Merge topic 'msvc_static_assert'Brad 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 Nightly Date StampKitware Robot2020-08-251-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'fetchcontent-source-dir'Craig Scott2020-08-244-13/+86
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b972e25276 FetchContent: Fix SOURCE_DIR, BUILD_DIR when disconnected or overridden Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5156
| * | | | | | | | | FetchContent: Fix SOURCE_DIR, BUILD_DIR when disconnected or overriddenCraig Scott2020-08-234-13/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21123
* | | | | | | | | | Merge topic 'known_features_docs'Craig Scott2020-08-241-55/+87
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 268fcc2782 Help: Separate C++ compile feature by standard Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5151
| * | | | | | | | | | Help: Separate C++ compile feature by standardFrancisco Pombal2020-08-231-55/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally, mention that no fine-grained features are available for C++ 17 and beyond. Co-Authored-By: Craig Scott <craig.scott@crascit.com>
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2020-08-241-1/+1
| |/ / / / / / / / / |/| | | | | | | | |
generated by cgit v0.12 at 2024-11-15 22:44:33 (GMT)