summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ISPC: Add compiler launcher supportRobert Maynard2020-09-0318-5/+38
|
* Merge topic 'getdef'Brad King2020-09-0383-702/+745
|\ | | | | | | | | | | | | 11425041f0 cmMakefile::GetDefinition: return cmProp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5179
| * cmMakefile::GetDefinition: return cmPropVitaly Stakhovsky2020-09-0283-702/+745
| |
* | Merge topic 'Fortran-visibility-var'Brad King2020-09-031-0/+1
|\ \ | | | | | | | | | | | | | | | | | | 76cc687e98 Fortran: Initialize Fortran_VISIBILITY_PRESET property from variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5182
| * | Fortran: Initialize Fortran_VISIBILITY_PRESET property from variableThomas G2020-09-021-0/+1
| | | | | | | | | | | | | | | The `CMAKE_Fortran_VISIBILITY_PRESET` variable is documented to initialize the property. Fix it.
* | | Merge branch 'release-3.18'Brad King2020-09-030-0/+0
|\ \ \
| * \ \ Merge topic 'ninja-multi-automoc-regression' into release-3.18Brad King2020-09-039-5/+39
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9fd3a107d Ninja Multi-Config: Fix dependencies of utility targets f1199bdc96 Ninja Multi-Config: Fix cleaning of utility targets with commands 657047cd24 Ninja Multi-Config: Fix clean:all target c35d1927a5 Tests: Pass additional Qt information to Ninja and NMC tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5177
* | \ \ \ Merge topic 'ninja-multi-automoc-regression'Brad King2020-09-039-5/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2a6471dd7b Merge branch 'master' into ninja-multi-automoc-regression a9fd3a107d Ninja Multi-Config: Fix dependencies of utility targets f1199bdc96 Ninja Multi-Config: Fix cleaning of utility targets with commands 657047cd24 Ninja Multi-Config: Fix clean:all target c35d1927a5 Tests: Pass additional Qt information to Ninja and NMC tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5177
| * \ \ \ \ Merge branch 'master' into ninja-multi-automoc-regressionKyle Edwards2020-09-021883-5500/+19803
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| |
| * | | | Ninja Multi-Config: Fix dependencies of utility targetsKyle Edwards2020-09-026-2/+32
| | | | | | | | | | | | | | | | | | | | Fixes: #21118
| * | | | Ninja Multi-Config: Fix cleaning of utility targets with commandsKyle Edwards2020-09-021-0/+2
| | | | |
| * | | | Ninja Multi-Config: Fix clean:all targetKyle Edwards2020-09-021-0/+1
| | | | |
| * | | | Tests: Pass additional Qt information to Ninja and NMC testsKyle Edwards2020-09-013-3/+4
| | | | |
* | | | | Merge branch 'release-3.18'Brad King2020-09-030-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge topic 'FindPython-include-dir-ABI-checks' into release-3.18Brad King2020-09-031-8/+18
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 6fdfe2428d FindPython: enhance ABI checks against include directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5181
* | | | | Merge topic 'FindPython-include-dir-ABI-checks'Brad King2020-09-031-8/+18
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 6fdfe2428d FindPython: enhance ABI checks against include directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5181
| * | | | FindPython: enhance ABI checks against include directoryMarc Chevrier2020-09-021-8/+18
| |/ / / | | | | | | | | | | | | Fixes: #21149
* | | | CMake Nightly Date StampKitware Robot2020-09-031-1/+1
| |/ / |/| |
* | | Merge topic 'xcode-custom-commands'Brad King2020-09-022-7/+37
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e33f8f078a Xcode: Avoid unnecessary duplication of custom commands across targets 8c60c49ae2 Xcode: Refactor custom command dependency expansion Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5176
| * | | Xcode: Avoid unnecessary duplication of custom commands across targetsBrad King2020-09-012-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not attach a custom command to a target if it is already attached to one of the target's dependencies. The command's output will be available by the time the target needs it because the dependency containing the command will have already been built. Since commit fb45559e09 (Xcode: Process targets in depth-first order during generation, 2018-07-19, v3.13.0-rc1~293^2) we generate a target only after generating its dependencies. Therefore when visiting the custom commands in a target, we can assume that custom commands in its dependencies have already been visited.
| * | | Xcode: Refactor custom command dependency expansionBrad King2020-09-011-6/+11
| | | | | | | | | | | | | | | | Compute and store the "real" dependencies earlier.
* | | | Merge topic 'xcode-tests-prep'Brad King2020-09-029-14/+44
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d1688ff300 Tests: Tell Xcode to disallow signing altogether in relevant cases 266f97315b Tests: Update RunCMake.CommandLine to avoid duplicate custom commands 7678fcd577 Tests: Remove workaround from RunCMake.ExternalProject MultiCommand case Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5174
| * | | | Tests: Tell Xcode to disallow signing altogether in relevant casesBrad King2020-09-016-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Xcode 'new build system' rejects empty signing identities unless signing is explicitly marked as not allowed. Update test cases where we turn off signing to explicitly disallow it too. Also turn off signing in the XCTest test.
| * | | | Tests: Update RunCMake.CommandLine to avoid duplicate custom commandsBrad King2020-09-012-10/+32
| | | | | | | | | | | | | | | | | | | | | | | | | This test does not need to have the same custom command output generated by multiple independent targets. Revise the test to avoid that.
| * | | | Tests: Remove workaround from RunCMake.ExternalProject MultiCommand caseBrad King2020-09-011-4/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | Since commit 7249ba9677 (ExternalProject: Enforce that patch depends on update, 2020-04-03, v3.18.0-rc1~403^2) we do not need the workaround in the MultiCommand case.
* | | | Merge topic 'armclang-asm-defines'Brad King2020-09-021-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | fa7ba5fbf5 ARMClang: Pass defines to assembler Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Osama Moharam <osama.moharam.uw@renesas.com> Acked-by: Martin Kojtal <martin.kojtal@arm.com> Merge-request: !5175
| * | | ARMClang: Pass defines to assemblerHugues Kamba2020-09-011-1/+1
| |/ / | | | | | | | | | | | | This is useful when the assembly file(s) is passed to the pre-processor.
* | | CMake Nightly Date StampKitware Robot2020-09-021-1/+1
|/ /
* | 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
| | | | | | | |