summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'target_genex_dependency'Brad King2020-09-0115-15/+223
|\ | | | | | | | | | | | | | | f14b390198 GenEx: Remove unneeded dependencies from target info queries Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Raul Tambre <raul@tambre.ee> Merge-request: !5127
| * GenEx: Remove unneeded dependencies from target info queriesRobert Maynard2020-09-0115-15/+223
| | | | | | | | | | | | | | | | | | | | Only generate a graph dependency between a custom command and a target when the custom command queries for the file path of an artifact of the target. This makes generator expressions such as `TARGET_FILE_DIR` behave the same way as `TARGET_PROPERTY` which never generated a graph dependency.
* | Merge topic 'xcode-link-phase-all'Craig Scott2020-09-0122-114/+582
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 525464ed2a Xcode: Use "Link Binary With Libraries" build phase in some cases dc0898205c Xcode: Add special case for file type extension map for .xcassets 7b3d8411a2 Xcode: Refactor build setting append code and attribute getter naming Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5036
| * | 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
* | | Merge topic 'cuda_host_compiler_fail'Brad King2020-09-013-21/+35
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 01428c5560 CUDA: Fail fast if CMAKE_CUDA_ARCHITECTURES doesn't work during detection 9f81aa0f69 CUDA: Fail if compiler detection using the host compiler fails Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5155
| * | | CUDA: Fail fast if CMAKE_CUDA_ARCHITECTURES doesn't work during detectionRaul Tambre2020-08-292-19/+21
| | | | | | | | | | | | | | | | | | | | Also re-ordered the code to avoid testing flags for other compilers, since we know the vendor before full detection.
| * | | CUDA: Fail if compiler detection using the host compiler failsRaul Tambre2020-08-293-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an user specified a host compiler we should fail if we are unable to perform compiler detection with it. Previously we would try without and likely succeed and continue. Then we'd fail during ABI detection and compiler testing since we'd still try to use it. This is particularly problematic when crosscompiling since we extract the host linker from the compiler detection link line. This would result in the wrong host linker being used and a linking error due to architecture mismatch during ABI detection where other necessary flags may already be present to make the host compiler work. See #21076 for an example. Fix this by adding CMAKE_<LANG>_COMPILER_ID_REQUIRE_SUCCESS to CMakeDetermineCompilerId, which throws a fatal error if executing the compiler results in a non-zero exit code. Fixes #21120.
* | | | Merge topic 'file_chmod'Brad King2020-09-0126-0/+312
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7de60beddf file: Add CHMOD and CHMOD_RECURSE subcommands Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Marc Chevrier <marc.chevrier@gmail.com> Merge-request: !5122
| * | | | file: Add CHMOD and CHMOD_RECURSE subcommandsSibi Siddharthan2020-08-2626-0/+312
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21057 Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
* | | | | Merge topic 'file-RENAME-windows'Brad King2020-09-012-37/+188
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e39e9c4043 cmSystemTools: Teach RenameFile to disable Windows Search Indexing b54190a406 cmSystemTools: Teach RenameFile to try for longer on directories 2f8ef095da cmSystemTools: Add more error handling to RenameFile on Windows d78c22aa64 cmSystemTools: Improve RenameFile on Windows with MOVEFILE_WRITE_THROUGH 73f8240ae7 cmSystemTools: Factor out RenameFile wstring conversion on Windows 97fc44f70e cmSystemTools: Factor out MoveFileExW call in RenameFile 35039286eb cmSystemTools: Define directory-specific Windows filesystem retry settings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5161
| * | | | | cmSystemTools: Teach RenameFile to disable Windows Search IndexingRon W Moore2020-08-311-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create RAII class SaveRestoreFileAttributes to manage Windows Search Indexing. Turn it off temporarily while renaming a directory. Issue: #19580
| * | | | | cmSystemTools: Teach RenameFile to try for longer on directoriesRon W Moore2020-08-311-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | Issue: #19580
| * | | | | cmSystemTools: Add more error handling to RenameFile on WindowsRon W Moore2020-08-311-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | Issue: #19580
| * | | | | cmSystemTools: Improve RenameFile on Windows with MOVEFILE_WRITE_THROUGHRon W Moore2020-08-311-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add this flag to tell `MoveFileExW` to flush the rename to disk before returning. Issue: #19580
| * | | | | cmSystemTools: Factor out RenameFile wstring conversion on WindowsRon W Moore2020-08-311-8/+9
| | | | | |
| * | | | | cmSystemTools: Factor out MoveFileExW call in RenameFileBrad King2020-08-311-5/+13
| | | | | |
| * | | | | cmSystemTools: Define directory-specific Windows filesystem retry settingsBrad King2020-08-272-22/+68
| | | | | | | | | | | | | | | | | | | | | | | | Inspired-by: Ron W Moore <webbtrail@gmail.com>
* | | | | | Merge topic 'ispc_lang_support'Brad King2020-09-0167-40/+1042
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5ece12b7e4 gitlab-ci: add ISPC to the Fedora CI image 8976817d6d ISPC: Update help documentation to include ISPC 2368f46ba4 ISPC: Support building with the MSVC toolchain e783bf8aa6 ISPC: Support ISPC header generation byproducts and parallel builds 34cc6acc81 Add ISPC compiler support to CMake 419d70d490 Refactor some swift only logic to be re-used by other languages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5065
| * | | | | | gitlab-ci: add ISPC to the Fedora CI imageBen Boeckel2020-08-287-1/+22
| | | | | | |
| * | | | | | ISPC: Update help documentation to include ISPCRobert Maynard2020-08-289-5/+62
| | | | | | |
| * | | | | | ISPC: Support building with the MSVC toolchainRobert Maynard2020-08-282-0/+9
| | | | | | |
| * | | | | | ISPC: Support ISPC header generation byproducts and parallel buildsRobert Maynard2020-08-2830-39/+343
| | | | | | |
| * | | | | | Add ISPC compiler support to CMakeRobert Maynard2020-08-2832-7/+621
| | | | | | |
| * | | | | | Refactor some swift only logic to be re-used by other languagesRobert Maynard2020-08-071-26/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic in AddSwiftInterfaceIncludeDirectories is something that other languages will want going forward
* | | | | | | Merge branch 'release-3.17' into masterBrad King2020-09-010-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'backport-3.17-automoc-depend-project-file' into release-3.17Brad King2020-08-319-1/+150
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !5166
* | \ \ \ \ \ \ \ Merge branch 'release-3.18'Brad King2020-09-010-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge topic 'automoc-depend-project-file' into release-3.18Brad King2020-09-019-1/+150
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ \ \ \ \ \ \ Merge topic 'automoc-depend-project-file'Brad King2020-09-019-1/+150
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | Merge branch 'backport-3.17-automoc-depend-project-file'Brad King2020-08-319-1/+150
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | AutoMoc: Restore support for re-running after project file changesJoerg Bornemann2020-08-319-1/+150
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | Merge branch 'release-3.18'Brad King2020-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'UseSWIG-interface-option' into release-3.18Brad King2020-09-019-1/+71
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d264685bee UseSWIG: Update option -interface usage Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5172
* | | | | | | | | | Merge topic 'UseSWIG-interface-option'Brad King2020-09-019-1/+71
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d264685bee UseSWIG: Update option -interface usage Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5172
| * | | | | | | | | UseSWIG: Update option -interface usageMarc Chevrier2020-08-319-1/+71
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Option -interface must not be used if multiple SWIG files are part of the same library. Fixes: #21134
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-09-011-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'cuda_docs_host_id'Brad King2020-08-311-6/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a57beabb78 Help: Reference CMAKE_CUDA_COMPILER_ID not CMAKE_CUDA_COMPILER Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5170
| * | | | | | | | | Help: Reference CMAKE_CUDA_COMPILER_ID not CMAKE_CUDA_COMPILERRaul Tambre2020-08-291-6/+6
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should refer to the compiler ID in the documentation to avoid users checking compiler executable names, since that seems fragile.
* | | | | | | | | Merge topic 'llvm_rc_preprocessing_for_all_windows_clang_variants'Brad King2020-08-311-20/+29
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | llvm-rc: Enable preprocessing for all Windows usage variantsThomas Bernard2020-08-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21096
| * | | | | | | | | llvm-rc: Refactor the preprocessing logicThomas Bernard2020-08-271-20/+27
| | | | | | | | | |
* | | | | | | | | | Merge topic 'ExternalProject-test-download-timeout'Brad King2020-08-311-5/+12
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | beab8bc29a Tests: Add timeout on the RunCMake.ExternalProject download server Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5167
| * | | | | | | | | Tests: Add timeout on the RunCMake.ExternalProject download serverThomas Bernard2020-08-271-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21132
* | | | | | | | | | CMake Nightly Date StampKitware Robot2020-08-311-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2020-08-301-1/+1
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-08-291-1/+1
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-08-281-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'release-3.18'Brad King2020-08-270-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |