summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'nsis-headerimage'Kyle Edwards2020-01-101-4/+9
|\ | | | | | | | | | | | | ebfffc609e CPack/NSIS: Add option for setting MUI_HEADERIMAGE_BITMAP Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4157
| * CPack/NSIS: Add option for setting MUI_HEADERIMAGE_BITMAPJohnny Jazeix2020-01-021-4/+9
| | | | | | | | Fixes: #20120
* | Merge topic 'ninja-postgen-commands'Brad King2020-01-102-0/+48
|\ \ | | | | | | | | | | | | | | | | | | | | | fb18215904 Ninja: clean ninja metadata once generated Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Jan Niklas Hasse <jhasse@bixense.com> Merge-request: !3316
| * | Ninja: clean ninja metadata once generatedBen Boeckel2020-01-062-0/+48
| | | | | | | | | | | | Fixes: #15830
* | | Merge topic 'cuda-device-link-only-cuda'Brad King2020-01-101-17/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 01c90d76a1 Merge branch 'backport-3.16-cuda-device-link-only-cuda' 7ffa42288e Merge branch 'backport-3.15-cuda-device-link-only-cuda' 071c4f1a2a CUDA: Do not device link if target has no CUDA usage Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4191
| * \ \ Merge branch 'backport-3.16-cuda-device-link-only-cuda'Brad King2020-01-091-17/+17
| |\ \ \
| | * \ \ Merge branch 'backport-3.15-cuda-device-link-only-cuda'Brad King2020-01-091-17/+17
| | |\ \ \
| | | * | | CUDA: Do not device link if target has no CUDA usageRobert Maynard2020-01-091-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When CUDA is enabled, and a pure non-CUDA target has CMAKE_CUDA_SEPARABLE_COMPILATION enabled, don't actually perform the device linking step, as it will fail. A target that has CMAKE_CUDA_SEPARABLE_COMPILATION enabled must also have CUDA usage (either itself, or something it links to). Fixes: #20182
| | | * | | CMake 3.15.6v3.15.6Brad King2019-12-161-1/+1
| | | | | |
| | | * | | Merge branch 'backport-3.15-vs-v142-version' into release-3.15Brad King2019-12-121-9/+11
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !4133
| | | | * | | VS: Fix support for v142 toolset minor versions in VS 16.5+Brad King2019-12-121-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit 5117389931 (VS: Fix support for v142 toolset minor versions, 2019-10-01, v3.15.5~6^2) worked around a bug in VS's placement of toolset files. VS 16.5 will fix that bug and restore the original pattern for locations of toolset files. Update our logic to look for both possibilities. Issue: #19779
| | | * | | | Check for support before adding bigtoc linker flagAlexander Grund2019-12-091-0/+25
| | | |/ / / | | | | | | | | | | | | | | | | | | Fixes: #20076
| | | * | | CMake 3.15.5v3.15.5Brad King2019-10-301-1/+1
| | | | | |
| | | * | | Merge branch 'vs-v142-csharp-flags' into release-3.15Brad King2019-10-111-2/+1
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !3908
| | | * \ \ \ Merge branch 'backport-vs-16.4-global-targets' into release-3.15Brad King2019-10-071-0/+4
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3896
| | | | * | | | VS: Tell VS 16.4 not to verify CMake-provided custom command outputsBrad King2019-10-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the fix from commit 0578239d3a (VS: Tell VS 16.4 not to verify SYMBOLIC custom command outputs, 2019-09-23, v3.15.4~2^2) to apply to outputs in CMake-provided targets like `install`. Simply mark these outputs as `SYMBOLIC` too since they are not actually generated. Fixes: #19737
| | | * | | | | Merge branch 'backport-xcode-scheme-custom-target' into release-3.15Brad King2019-10-021-1/+6
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3878
| | | | * | | | | Xcode: Restore CMAKE_XCODE_GENERATE_SCHEME for custom targetsBrad King2019-10-021-1/+6
| | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The target property introduced by commit 413b71485a (Xcode: Create Xcode schemes per target, 2019-03-11, v3.15.0-rc1~347^2) was accidentally not initialized by `CMAKE_XCODE_GENERATE_SCHEME` for custom targets. Fix it and update the test. Fixes: #19759
* | | | | | | | Merge topic 'objc-compiler-launcher'Brad King2020-01-103-3/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6ef6e5a73 Merge branch 'backport-3.16-objc-compiler-launcher' 1a9f6bad98 ObjC: Add _COMPILE_LAUNCHER support a05b9d4239 ObjC: Add _COMPILE_LAUNCHER support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4189
| * | | | | | | | ObjC: Add _COMPILE_LAUNCHER supportCristian Adam2020-01-093-3/+6
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20178
* | | | | | | | Merge topic 'custom-target-FOLDER'Brad King2020-01-101-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 353405daef Add support for FOLDER target property to custom targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4193
| * | | | | | | | Add support for FOLDER target property to custom targetsLuca Cappa2020-01-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18372
* | | | | | | | | Merge topic 'reduce_verbosity_find_package_debug_mode'Brad King2020-01-102-12/+35
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c92df382f find_package: Improve debug logging output Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4175
| * | | | | | | | | find_package: Improve debug logging outputRobert Maynard2020-01-012-12/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The find_package debug log messages are now easier to read when enabled by the `--debug-find` command-line option or `CMAKE_FIND_DEBUG_MODE` variable.
* | | | | | | | | | CMake Nightly Date StampKitware Robot2020-01-101-1/+1
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-01-091-1/+1
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge topic 'modernize-memory-management'Marc Chevrier2020-01-0839-254/+293
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a00960288b GlobalGenerator family: modernize memory management Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4181
| * | | | | | | | GlobalGenerator family: modernize memory managementMarc Chevrier2020-01-0739-254/+293
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-01-081-1/+1
|/ / / / / / / /
* | | | | | | | CMake Nightly Date StampKitware Robot2020-01-071-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'clang-format-headers-sort'Marc Chevrier2020-01-063-6/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8aa89352a clang-format: fix erroneous handling of header <queue> Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4182
| * | | | | | | | clang-format: fix erroneous handling of header <queue>Marc Chevrier2020-01-063-6/+3
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | The rule Regex: '^<' was not applied to this header because a more specific one applies: Regex: '^(<|")Qt?[A-Z]' used for Qt headers (rules are not case-sensitive). So adding a specific rule for this header before the Qt rule is required.
* | | | | | | | Merge topic 'autogen_hh_headers'Kyle Edwards2020-01-063-54/+124
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9eab3cad6a Tests: Add AUTOGEN policy CMP0100 test 8c2be3ae94 Tests: Restore Autogen/SameName .hh header test abad139c99 Autogen: Process .hh headers based on new policy CMP0100 settings 4db1463e05 Autogen: Try adding header suffix to moc output file name on name conflicts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4170
| * | | | | | | Autogen: Process .hh headers based on new policy CMP0100 settingsSebastian Holtermann2020-01-043-41/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reintroduces .hh header processing in AUTOMOC and AUTOUIC based on the new policy CMP0100 setting. Fixes: #13904 CMAKE_AUTOMOC misses headers with ".hh" extension
| * | | | | | | Autogen: Try adding header suffix to moc output file name on name conflictsSebastian Holtermann2020-01-041-13/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In AUTOGEN, this changes the moc output file name computation on output name conflicts to first try to add the header suffix to the moc output base name. When that still conflicts, we try adding a range of sequential numbers. If we still can't find an unique output name, we raise an error.
* | | | | | | | CMake Nightly Date StampKitware Robot2020-01-061-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-01-051-1/+1
|/ / / / / / /
* | | | | | | CMake Nightly Date StampKitware Robot2020-01-041-1/+1
| | | | | | |
* | | | | | | Merge topic 'add_target_deprecation'Kyle Edwards2020-01-034-0/+42
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c621839bd9 Add set_property option: DEPRECATION Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Daniele E. Domenichelli <ddomenichelli@drdanz.it> Merge-request: !4128
| * | | | | | | Add set_property option: DEPRECATIONJoseph Snyder2020-01-024-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new property flag for a target which contains a message regarding deprecation status. Add a warning at "Generate" time if a linked target is marked as deprecated. Expand ExportImport test to ensure that new property is being set and passed correctly. Ensure that the message is shown during the "Generate" step run of the ExportImport test.
* | | | | | | | Merge topic 'cmstate-std-string'Marc Chevrier2020-01-034-22/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 232d5bc333 cmState: more members will use std::string Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4164
| * | | | | | | | cmState: more members will use std::stringVitaly Stakhovsky2020-01-024-22/+25
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-01-031-1/+1
|/ / / / / / / /
* | | | | | | | Merge topic 'modernize-memory-management'Marc Chevrier2020-01-0218-101/+115
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5444a8095d cmGlobalGenerator: modernize memrory managemenbt Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4166
| * | | | | | | | cmGlobalGenerator: modernize memrory managemenbtMarc Chevrier2019-12-3018-101/+115
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-01-021-1/+1
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-01-011-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2019-12-311-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2019-12-301-1/+1
|/ / / / / / /
* | | | | | | CMake Nightly Date StampKitware Robot2019-12-291-1/+1
| | | | | | |