summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fix-cpack-deb-description-file'Brad King2020-01-137-10/+28
|\ | | | | | | | | | | | | d491f34a5e CPack: Fix regression in DEB generator description Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4204
| * CPack: Fix regression in DEB generator descriptionKyle Edwards2020-01-107-10/+28
| | | | | | | | Fixes: #20102
* | Merge branch 'release-3.16'Brad King2020-01-130-0/+0
|\ \
| * \ Merge topic 'objc-visibility-inlines' into release-3.16Brad King2020-01-134-11/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 7347e2f830 ObjC: Add VISIBLITY_INLINES_HIDDEN support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4199
* | \ \ Merge topic 'objc-visibility-inlines'Brad King2020-01-134-11/+10
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 7347e2f830 ObjC: Add VISIBLITY_INLINES_HIDDEN support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4199
| * | | ObjC: Add VISIBLITY_INLINES_HIDDEN supportCristian Adam2020-01-104-11/+10
| | | | | | | | | | | | | | | | Fixes: #20193
* | | | Merge branch 'release-3.16'Brad King2020-01-130-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'macOS-Xcode-11-frameworks' into release-3.16Brad King2020-01-132-0/+7
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | fcde42751a FindPython: ensure new Xcode framework for Python3 is detected dd7b741b81 macOS: Add support for new Xcode 11 frameworks directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4198
* | | | Merge topic 'macOS-Xcode-11-frameworks'Brad King2020-01-132-0/+7
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | fcde42751a FindPython: ensure new Xcode framework for Python3 is detected dd7b741b81 macOS: Add support for new Xcode 11 frameworks directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4198
| * | | FindPython: ensure new Xcode framework for Python3 is detectedMarc Chevrier2020-01-101-0/+3
| | | |
| * | | macOS: Add support for new Xcode 11 frameworks directoryMarc Chevrier2020-01-101-0/+4
| | |/ | |/| | | | | | | Update CMAKE_SYSTEM_FRAMEWORK_PATH with new Xcode 11 frameworks directory
* | | CMake Nightly Date StampKitware Robot2020-01-131-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2020-01-121-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2020-01-111-1/+1
| | |
* | | Merge topic 'nvcc-options-version'Brad King2020-01-101-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7560c68f2c CUDA: Fix compiler option version checks for nvcc 10.2.19 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !4161
| * | | CUDA: Fix compiler option version checks for nvcc 10.2.19Raul Tambre2020-01-031-2/+2
| | | |
* | | | Merge topic 'cpack_nsis_avoid_delay'Brad King2020-01-101-9/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9d2816544e CPack/NSIS: Also preload the "UserInfo.dll" plugin 13567bd186 CPack/NSIS: Avoid "setup loading" screen by fixing template order Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4171
| * | | | CPack/NSIS: Also preload the "UserInfo.dll" pluginPatrick Storz2020-01-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | This is currently used to provide UserInfo::GetName and UserInfo::GetAccountType functions.
| * | | | CPack/NSIS: Avoid "setup loading" screen by fixing template orderPatrick Storz2020-01-041-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NSIS packages files (including those required by the installer itslef) in the order in which they're mentioned in the .nsi file. If solid compression is used, the installer might need to extract large parts of the archive to be able to even start the setup program ("Please wait while setup is loading..."). Avoid this by moving component installation towards the end of the template file.
* | | | | 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