summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | gitlab-ci: make rules a bit more uniformBen Boeckel2020-06-122-30/+32
| | | |
| * | | gitlab-ci: split into multiple filesBen Boeckel2020-06-127-462/+524
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add comments for sections to make it easier to figure out what's going on. Also rename the `cmake_test_unix_package` to be Linux-specific since it actually is.
* | | | Merge topic 'cuda_clang_toolkit_path' into release-3.18Brad King2020-06-158-260/+448
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec59fb6c31 CUDA: Determine CUDA toolkit location for NVCC 0a056246a1 CUDA: Pass toolkit path to Clang 9c43972127 FindCUDAToolkit: Avoid unnecessary temporary variable computing binary dir 9eebb5b8b2 FindCUDAToolkit: Remove unnecessary checks around searches 8f01fe7bf1 FindCUDAToolkit: Use list(SORT) to sort in natural order 8c144fe9ad FindCUDAToolkit: Compute CUDAToolkit_INCLUDE_DIR instead of searching 403f8d31e3 FindCUDAToolkit: Add CUDAToolkit_LIBRARY_ROOT 6636693134 FindCUDAToolkit: Re-unify with Internal/CUDAToolkit Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4828
| * | | | CUDA: Determine CUDA toolkit location for NVCCRaul Tambre2020-06-124-126/+134
| | | | | | | | | | | | | | | | | | | | | | | | | Similar to how we already do for Clang. Avoids a lot of redundant work in FindCUDAToolkit.
| * | | | CUDA: Pass toolkit path to ClangRaul Tambre2020-06-125-235/+293
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang isn't very good at finding the installed CUDA toolkit. The upstream recommendation is that we should pass the toolkit explicitly. Additionally: * Avoids Clang having to search for the toolkit on every invocation. * Allows the user to use a toolkit from a non-standard location by simply setting CUDAToolkit_ROOT. The same way as with FindCUDAToolkit. Clang wants the directory containing the device library and version.txt as the toolkit path. We thus pass the newly introduced CUDAToolkit_LIBRARY_ROOT as the toolkit path. We save CUDAToolkit_ROOT_DIR and CUDAToolkit_LIBRARY_ROOT on Clang to have them available in try_compile() and avoid unnecessary re-searching or a possibly different installation being found in FindCUDAToolkit. This however means that the selected toolkit can't be changed after the initial language enablement. We now determine CUDA compiler ID before doing actual detection, as we don't want to spend time finding the CUDA toolkit for NVIDIA. Implements #20754.
| * | | | FindCUDAToolkit: Avoid unnecessary temporary variable computing binary dirRaul Tambre2020-06-121-6/+4
| | | | |
| * | | | FindCUDAToolkit: Remove unnecessary checks around searchesRaul Tambre2020-06-122-21/+15
| | | | | | | | | | | | | | | | | | | | | | | | | find_*() don't search if the result variable is already set. Remove the if()s around such cases.
| * | | | FindCUDAToolkit: Use list(SORT) to sort in natural orderRaul Tambre2020-06-122-72/+8
| | | | | | | | | | | | | | | | | | | | | | | | | We had a custom loop to sort in the natural order. Since CMake 3.18 this is supported natively by CMake and simplifies the code significantly.
| * | | | FindCUDAToolkit: Compute CUDAToolkit_INCLUDE_DIR instead of searchingRaul Tambre2020-06-122-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can avoid searching for this since CUDAToolkit_TARGET_DIR always contains the include/ directory. But add a warning just in case. Also apply this in CMakeDetermineCUDACompiler for Clang code.
| * | | | FindCUDAToolkit: Add CUDAToolkit_LIBRARY_ROOTRaul Tambre2020-06-123-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On scattered installations version.txt and nvvm are located at this location. This may be useful to users and will allow us in the future to parse version.txt instead of invoking nvcc to figure out the CUDA toolkit version. We also add it to CMakeDetermineCUDACompiler in preparation for future use by Clang code.
| * | | | FindCUDAToolkit: Re-unify with Internal/CUDAToolkitRaul Tambre2020-06-123-233/+390
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A portion of FindCUDAToolkit was previously split in commit dc2eae1f (FindCUDAToolkit: Factor out discovery code into a separate file, 2020-04-22) out into Internal/CUDAToolkit to allow re-use of the code in CMakeDetermineCUDACompiler for Clang support. This has turned out to be a bad solution due to Clang requiring quite a bit of special handling and special handling for NVCC leaking out from Internal/CUDAToolkit into the Clang code using it. Thus it seems better to re-unify this code and duplicate the parts of the code necessary for Clang where it's required. This will help us get logic correct for both NVCC and CUDA handling. We can still unify the common parts in the future once the code has matured.
* | | | | 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.
generated by cgit v0.12 at 2025-04-23 03:59:46 (GMT)