summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cuda_architectures_disable' into release-3.18Brad King2020-06-157-25/+81
|\ | | | | | | | | | | | | 877a92e968 CUDA: Add support for disabling CUDA_ARCHITECTURES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4886
| * CUDA: Add support for disabling CUDA_ARCHITECTURESRaul Tambre2020-06-157-25/+81
| | | | | | | | | | | | | | | | | | | | The ability to disable adding architectures completely for packaging purposes and cases requiring passing the architectures flags explicitly has been requested. Support a false value for CUDA_ARCHITECTURES and CMAKE_CUDA_ARCHITECTURES for this purpose. Implements #20821.
* | Merge topic 'clang_cxx20' into release-3.18Brad King2020-06-151-1/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | b365385d66 Clang: Record Clang 6.0+ as fully supporting C++17 5d26efe38f Clang: Add final C++20 flag for Clang 11.0+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4887
| * | Clang: Record Clang 6.0+ as fully supporting C++17Raul Tambre2020-06-131-0/+4
| | |
| * | Clang: Add final C++20 flag for Clang 11.0+Raul Tambre2020-06-131-1/+4
| |/ | | | | | | | | -std=c++20 superseded -std=c++2a in upstream Clang commit 24ad121582454e625bdad125c90d9ac0dae948c8.
* | Merge topic 'revert-find_program-exe-no-read' into release-3.18Brad King2020-06-153-5/+11
|\ \ | |/ |/| | | | | | | | | cc02ced530 find_program: Revert "Find programs that are executable but not readable" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4871
| * find_program: Revert "Find programs that are executable but not readable"Brad King2020-06-123-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit 86e6349ef7 (find_program: Find programs that are executable but not readable, 2020-04-04, v3.18.0-rc1~372^2) can break existing projects that were (likely accidentally) relying on the old behavior to find files that are readable but not executable. Revert the fix for now. We can re-introduce it with a policy later. Instead of reverting the test case, update it to cover the old behavior. That can serve as a reference for testing the policy when introduced. Fixes: #20814 Issue: #10468
* | Merge topic 'gitlab-ci-xcode-testing' into release-3.18Brad King2020-06-126-8/+45
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 0f4777ab81 ci: don't test BundleGeneratorTest 77b44ed4ba gitlab-ci: add an Xcode tester d33b38d4aa gitlab-ci: rename some scripts to be Linux-specific Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4883
| * | ci: don't test BundleGeneratorTestBen Boeckel2020-06-121-0/+3
| | | | | | | | | | | | | | | This test uses shared global resources and doesn't work well with the CI infrastructure we have. It is tested by nightly builders however.
| * | gitlab-ci: add an Xcode testerBen Boeckel2020-06-125-2/+37
| | |
| * | gitlab-ci: rename some scripts to be Linux-specificBen Boeckel2020-06-121-7/+6
|/ / | | | | | | macOS install trees have a different layout and package names.
* | Merge topic 'gitlab-ci-ext-test-sets' into release-3.18Brad King2020-06-1210-53/+149
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 2e7cefec03 gitlab-ci: add a cuda10.2 builder 1a2961b895 Tests: add CUDA labels to tests which are affected by CUDA 2caa7502d5 ci: support running just a set of tests with external builders 26b4cbcf93 gitlab-ci: move Makefiles Linux tests to use the package Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4877
| * | gitlab-ci: add a cuda10.2 builderBen Boeckel2020-06-124-0/+52
| | |
| * | Tests: add CUDA labels to tests which are affected by CUDABen Boeckel2020-06-114-33/+61
| | |
| * | ci: support running just a set of tests with external buildersBen Boeckel2020-06-111-0/+7
| | |
| * | gitlab-ci: move Makefiles Linux tests to use the packageBen Boeckel2020-06-112-20/+29
| | |
* | | Merge topic 'vs-lang-C' into release-3.18Brad King2020-06-124-4/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5c04e77e07 VS: Restore compilation of '.C' sources as C++ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4880
| * | | VS: Restore compilation of '.C' sources as C++Brad King2020-06-114-4/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 3b547e2e4b (VS: Simplify logic adding source file C/C++ language flag to MSVC, 2020-05-15, v3.18.0-rc1~139^2~1) failed to account for MSVC's treatment of `.C` extensions as C. Add this special case to the logic to restore use of `-TP` for `.C` extensions. Fixes: #20822
* | | Merge topic 'gitlab-ci-more-qtdialog' into release-3.18Brad King2020-06-127-3/+184
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | d7679f6427 QCMakeCacheView: use non-deprecated List and Set constructions 973fc56020 gitlab-ci: test QtDialog on macOS 1a995439e5 ci: add download information for Qt on macOS 881c0b86dd gitlab-ci: test QtDialog on Windows b8d46d5e50 ci: add a script to download Qt Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4874
| * | QCMakeCacheView: use non-deprecated List and Set constructionsBen Boeckel2020-06-101-2/+15
| | |
| * | gitlab-ci: test QtDialog on macOSBen Boeckel2020-06-102-0/+5
| | |
| * | ci: add download information for Qt on macOSBen Boeckel2020-06-102-0/+12
| | |
| * | gitlab-ci: test QtDialog on WindowsBen Boeckel2020-06-103-1/+7
| | |
| * | ci: add a script to download QtBen Boeckel2020-06-102-0/+145
| |/
* | Merge topic 'nvcc_supports_cuda17' into release-3.18Brad King2020-06-111-0/+11
|\ \ | | | | | | | | | | | | | | | | | | 95700be52d CUDA: Teach CMake that NVCC 11 supports cuda_std_17 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4872
| * | CUDA: Teach CMake that NVCC 11 supports cuda_std_17Robert Maynard2020-06-101-0/+11
| |/
* | Merge topic 'FindProtobuf-typo' into release-3.18Brad King2020-06-111-1/+1
|\ \ | | | | | | | | | | | | | | | | | | c1de3d1b34 FindProtobuf: Fix typo in documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4873
| * | FindProtobuf: Fix typo in documentationRon Klein2020-06-101-1/+1
| |/ | | | | | | typo: "filess" ==> "files"
* | Merge topic 'add-missing-test-args' into release-3.18Craig Scott2020-06-101-0/+13
|\ \ | |/ |/| | | | | | | | | 131b8cc8ae Help/dev: document other arguments to `Do: test` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4870
| * Help/dev: document other arguments to `Do: test`Ben Boeckel2020-06-091-0/+13
| |
* | CMake 3.18.0-rc1v3.18.0-rc1Brad King2020-06-091-1/+1
| |
* | Merge topic 'cmGeneratorTarget-include-cmProperty' into release-3.18Brad King2020-06-091-2/+1
|\ \ | | | | | | | | | | | | | | | | | | e65e88fbce cmGeneratorTarget: fix misplaced header Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4864
| * | cmGeneratorTarget: fix misplaced headerVitaly Stakhovsky2020-06-081-2/+1
| | | | | | | | | | | | | | | | | | In commit b36d1bdd9d (Single location for cmProp typedef, 2020-05-30) we accidentally left inclusion of `cmProperty.h` out of the main block of includes.
* | | Merge topic 'cpack-ifw-3.2' into release-3.18Brad King2020-06-091-0/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | b79aad8069 CPack/IFW: Add Qt installer framework version 3.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4859
| * | CPack/IFW: Add Qt installer framework version 3.2Frederik Gladhorn2020-06-081-0/+2
| |/ | | | | | | Qt 5.15 comes with IFW 3.2
* | Merge topic 'FindOpenSSL-3.0' into release-3.18Brad King2020-06-091-2/+4
|\ \ | | | | | | | | | | | | | | | | | | 796b447373 FindOpenSSL: Fix OpenSSL 3.0.0 version extraction Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4860
| * | FindOpenSSL: Fix OpenSSL 3.0.0 version extractionBilly Brumley2020-06-081-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fix the regex syntax added by commit 61d746e592 (FindOpenSSL: Detect OpenSSL 3.0.0, 2020-05-27, v3.17.3~1^2). Add missing escapes. Test with `openssl-3.0.0-alpha3`. While at it, also unset a temporary variable after use.
* | | Merge topic 'doc-gitlab-ci' into release-3.18Craig Scott2020-06-091-34/+31
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 855ed80111 Help/dev: Update CMake Review Process document for GitLab CI Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4865
| * | | Help/dev: Update CMake Review Process document for GitLab CIBrad King2020-06-091-34/+31
| | |/ | |/| | | | | | | | | | We have replaced use of `buildbot` with GitLab CI. Update the relevant section of our review process documentation.
* | | Merge topic 'doc-testprop-DEPENDS-REQUIRED_FILES' into release-3.18Craig Scott2020-06-092-1/+44
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b75175219 Help: Add example for REQUIRED_FILES test property 61139c91d2 Help: Add example for DEPENDS test property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4853
| * | | Help: Add example for REQUIRED_FILES test propertyMichael Hirsch2020-06-081-1/+32
| | | |
| * | | Help: Add example for DEPENDS test propertyMichael Hirsch2020-06-081-0/+12
| | | |
* | | | Merge topic 'remove-unused-ci-script' into release-3.18Brad King2020-06-081-22/+0
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | f8b2d8f178 ci: remove unused sccache download script Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4866
| * | | ci: remove unused sccache download scriptBen Boeckel2020-06-081-22/+0
|/ / /
* | | Merge topic 'cpack_typo' into release-3.18Brad King2020-06-081-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f859e6f812 CPack/IFW: Fix documentation typo: REQUARED Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4862
| * | | CPack/IFW: Fix documentation typo: REQUAREDFrederik Gladhorn2020-06-081-1/+1
|/ / /
* | | Merge topic 'vs-add_package_reference_install' into release-3.18Brad King2020-06-083-1/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3fd07d30bf VS: Enable DOTNET_TARGET_FRAMEWORK properties all target types Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4854
| * | | VS: Enable DOTNET_TARGET_FRAMEWORK properties all target typesKinan Mahdi2020-06-053-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes them compatible with `VS_PACKAGE_REFERENCES` and, in particular, fixes nuget package references in combination with install targets. Fixes: #20764
* | | | Merge topic 'cuda_cudart_status' into release-3.18Brad King2020-06-081-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e2f86461a FindCUDAToolkit: Fix cudart not found status message Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4861
| * | | | FindCUDAToolkit: Fix cudart not found status messageRaul Tambre2020-06-081-4/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | This ended up after the searching after commit dc2eae1 (FindCUDAToolkit: Factor out discovery code into a separate file, 2020-04-22). Move it back to where it was and should be.