summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'nsis-headerimage'Kyle Edwards2020-01-1011-4/+111
|\ | | | | | | | | | | | | 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-0211-4/+111
| | | | | | | | Fixes: #20120
* | Merge topic 'bootstrap-release'Brad King2020-01-101-0/+1
|\ \ | | | | | | | | | | | | | | | | | | 9969efa1ae bootstrap: Build with Release config by default to get optimizations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4196
| * | bootstrap: Build with Release config by default to get optimizationsBrad King2020-01-091-0/+1
| | | | | | | | | | | | Fixes: #20197
* | | Merge topic 'ninja-postgen-commands'Brad King2020-01-103-0/+53
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-063-0/+53
| | | | | | | | | | | | | | | | Fixes: #15830
* | | | Merge branch 'release-3.15'Brad King2020-01-100-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'backport-3.15-cuda-device-link-only-cuda' into release-3.15Brad King2020-01-094-18/+27
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !4191
* | \ \ \ \ Merge branch 'release-3.16'Brad King2020-01-100-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge topic 'cuda-device-link-only-cuda' into release-3.16Brad King2020-01-104-17/+26
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 topic 'cuda-device-link-only-cuda'Brad King2020-01-104-17/+26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-094-17/+26
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Merge branch 'backport-3.15-cuda-device-link-only-cuda'Brad King2020-01-094-17/+26
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | CUDA: Do not device link if target has no CUDA usageRobert Maynard2020-01-094-18/+27
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge branch 'release-3.16'Brad King2020-01-100-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge topic 'GNUtoMS-vs2019' into release-3.16Brad King2020-01-101-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 08c5b3eff0 GNUtoMS: Add search path for VS 2019 environment scripts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4197
* | \ \ \ \ \ \ Merge topic 'GNUtoMS-vs2019'Brad King2020-01-101-1/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 08c5b3eff0 GNUtoMS: Add search path for VS 2019 environment scripts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4197
| * | | | | | | GNUtoMS: Add search path for VS 2019 environment scriptsBrad King2020-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the logic from commit abe8a623d9 (GNUtoMS: Add search path for VS 2017 environment scripts, 2017-05-19, v3.8.2~1^2) to consider VS 2019 paths too. Fixes: #20162
* | | | | | | | Merge branch 'release-3.16'Brad King2020-01-100-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'objc-compiler-launcher' into release-3.16Brad King2020-01-1017-5/+40
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a05b9d4239 ObjC: Add _COMPILE_LAUNCHER support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4189
* | | | | | | | Merge topic 'objc-compiler-launcher'Brad King2020-01-1029-5/+64
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ \ \ Merge branch 'backport-3.16-objc-compiler-launcher'Brad King2020-01-090-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | ObjC: Add _COMPILE_LAUNCHER supportCristian Adam2020-01-0917-5/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20178
| * | | | | | | | ObjC: Add _COMPILE_LAUNCHER supportCristian Adam2020-01-0929-5/+64
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | 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-104-17/+45
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-014-17/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | Merge topic 'findopenssl-dependencies-link-order'Brad King2020-01-101-7/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90973c4abd FindOpenSSL: Fix ordering of dependency link flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4173
| * | | | | | | | | | FindOpenSSL: Fix ordering of dependency link flagsAshley Whetter2019-12-311-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20082
* | | | | | | | | | | Merge topic 'docs-autogen'Craig Scott2020-01-109-27/+29
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 159d2ead95 Help: Mention both target and source properties for AUTO..._OPTIONS 648234b8ba Help: Clarify/add docs for initializing AUTO..._OPTIONS properties dd2f42cc84 Help: Clean up formatting and typos in autogen docs 2ec57e11fb Help: Fix sorting of property indexes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4194
| * | | | | | | | | | | Help: Mention both target and source properties for AUTO..._OPTIONSCraig Scott2020-01-092-5/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Help: Clarify/add docs for initializing AUTO..._OPTIONS propertiesCraig Scott2020-01-093-7/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Help: Clean up formatting and typos in autogen docsCraig Scott2020-01-094-7/+7
| | | | | | | | | | | |
| * | | | | | | | | | | Help: Fix sorting of property indexesCraig Scott2020-01-091-8/+8
| | | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'FindPython-SOABI'Marc Chevrier2020-01-106-6/+104
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 61502d3956 FindPython: Add variable Python_SOABI Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4190
| * | | | | | | | | | | | FindPython: Add variable Python_SOABIMarc Chevrier2020-01-096-6/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This variable holds the standard extension suffix for modules. Fixes: #20150
* | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2020-01-101-1/+1
| |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'release-3.16'Brad King2020-01-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | / / / / / | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'release-3.15' into release-3.16Brad King2020-01-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | / / / | | | |_|_|_|_|/ / / | | |/| | | | | | |
* | | | | | | | | | Merge topic 'fix-check-compiler-flag-gcc-9'Marc Chevrier2020-01-091-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b10e493ac check_LANG_compiler_flag: add the "deprecated switch" message for GCC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4165
| * | | | | | | | | | check_LANG_compiler_flag: add the "deprecated switch" message for GCCAlessandro Menti2019-12-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the "deprecated switch" message for GCC to CMakeCheckCompilerFlagCommonPatterns.cmake.
* | | | | | | | | | | Merge topic 'findlibxml2_consistent_info'Marc Chevrier2020-01-091-5/+14
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4041cf5f61 FindLibXml2: ensure consistent paths, version and flag information Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4188
| * | | | | | | | | | FindLibXml2: ensure consistent paths, version and flag informationSylvain Joubert2020-01-071-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As pkg-config is used as hint to perform the actual lookup of libraries and include paths we may not find the pkg-config installation. Mainly this makes sure the pkg-config information are used only if the actual installation reported to the user is the one from pkg-config. Fixes: #20149
* | | | | | | | | | | 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-064-6/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8aa89352a clang-format: fix erroneous handling of header <queue> Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4182