summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* cmStringAlgorithms: Add faster cmJoin overloads for stringsOleksandr Koval2020-09-033-4/+69
| | | | | | | cmJoin() is often used with std::string ranges. Generic implementation uses std::ostringstream which is not optimal. With strings we can avoid operator<<() and make much faster implementation. Additional 'initial' argument is useful for cmStringCommand.cxx:HandleAppendCommand().
* 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 topic 'ninja-multi-automoc-regression'Brad King2020-09-032-1/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-02188-3388/+5546
| |\ \ \ | | |/ /
| * | | Ninja Multi-Config: Fix dependencies of utility targetsKyle Edwards2020-09-021-1/+2
| | | | | | | | | | | | | | | | 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
| | | |
* | | | 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.
* | | CMake Nightly Date StampKitware Robot2020-09-021-1/+1
|/ /
* | Merge topic 'target_genex_dependency'Brad King2020-09-012-3/+74
|\ \ | | | | | | | | | | | | | | | | | | | | | 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-012-3/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-015-114/+291
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-312-68/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'file_chmod'Brad King2020-09-011-0/+160
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-261-0/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0117-35/+290
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | ISPC: Support ISPC header generation byproducts and parallel buildsRobert Maynard2020-08-2812-9/+246
| | | | | | |
| * | | | | | Add ISPC compiler support to CMakeRobert Maynard2020-08-286-6/+27
| | | | | | |
| * | | | | | 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 topic 'automoc-depend-project-file'Brad King2020-09-012-1/+4
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-312-1/+4
| |\ \ \ \ \ \
| | * | | | | | AutoMoc: Restore support for re-running after project file changesJoerg Bornemann2020-08-312-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'backport-3.17-automoc_timestamp_deps' into release-3.17Brad King2020-08-052-3/+48
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !5085
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-09-011-1/+1
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | 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 topic 'ctest-FATAL_ERROR'Brad King2020-08-273-12/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-263-12/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21004
* | | | | | | | CMake Nightly Date StampKitware Robot2020-08-271-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'vs-win-sdk-custom-max'Brad King2020-08-264-10/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-254-10/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-08-261-1/+1
| |_|_|_|_|_|_|/ |/| | | | | | |