summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* file: Fix CONFIGURE output relative pathBrad King2020-06-296-3/+10
| | | | | | | | | In commit a6fee09484 (file: Add CONFIGURE subcommand, 2020-03-06, v3.18.0-rc1~584^2) we accidentally treated relative path outputs with respect to the current working directory. Treat them with respect to the current binary directory instead. Fixes: #20885
* CMake 3.18.0-rc2v3.18.0-rc2Brad King2020-06-171-1/+1
|
* Merge topic 'cuda_clang_limitations' into release-3.18Brad King2020-06-173-2/+8
|\ | | | | | | | | | | | | | | | | bdb105ee94 Help: Mention CUDA Clang limitations in 3.18 release notes fec7dd33d3 CUDA: Add issue number to Clang separable compilation error 14163d7d6b CUDA: Throw error for Clang on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4903
| * Help: Mention CUDA Clang limitations in 3.18 release notesRaul Tambre2020-06-161-1/+2
| |
| * CUDA: Add issue number to Clang separable compilation errorRaul Tambre2020-06-161-1/+2
| |
| * CUDA: Throw error for Clang on WindowsRaul Tambre2020-06-161-0/+4
| | | | | | | | | | | | Supporting compiling on Windows is more complicated than initially expected, so it won't make it into CMake 3.18. Add a helpful error for users.
* | Merge topic 'test-file-GET_RUNTIME_DEPENDENCIES' into release-3.18Brad King2020-06-1768-275/+295
|\ \ | | | | | | | | | | | | | | | | | | | | | 9ae3382855 Tests: Shorten case names in RunCMake.file-GET_RUNTIME_DEPENDENCIES test 248d0570c9 Tests: Factor out RunCMake.file-GET_RUNTIME_DEPENDENCIES test Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4904
| * | Tests: Shorten case names in RunCMake.file-GET_RUNTIME_DEPENDENCIES testBrad King2020-06-1664-255/+255
| | | | | | | | | | | | | | | Now that these cases are in a dedicated test we can drop the `file-GET_RUNTIME_DEPENDENCIES-` prefix from their name.
| * | Tests: Factor out RunCMake.file-GET_RUNTIME_DEPENDENCIES testBrad King2020-06-1669-296/+316
| |/ | | | | | | Move the `file(GET_RUNTIME_DEPENDENCIES)` cases out of `RunCMake.install`.
* | Merge topic 'test-CudaOnly.StaticRuntimePlusToolkit' into release-3.18Brad King2020-06-171-0/+6
|\ \ | |/ |/| | | | | | | | | cb9fab49dd Tests: Fix CudaOnly.StaticRuntimePlusToolkit build rpath Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4901
| * Tests: Fix CudaOnly.StaticRuntimePlusToolkit build rpathRobert Maynard2020-06-161-0/+6
| |
* | Merge topic 'test-RunCMake.GeneratorExpression' into release-3.18Brad King2020-06-16314-111/+160
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | 6308bfb737 Tests: Factor out RunCMake.GenEx-GENEX_EVAL test abe1c27499 Tests: Factor out RunCMake.GenEx-TARGET_FILE test fbead761fe Tests: Factor out RunCMake.GenEx-DEVICE_LINK test 64a8587332 Tests: Factor out RunCMake.GenEx-HOST_LINK test 6f224a065c Tests: Factor out RunCMake.GenEx-LINK_LANG_AND_ID test f3f6317ca3 Tests: Factor out RunCMake.GenEx-LINK_LANGUAGE test 983adb8bed Tests: Factor out RunCMake.GenEx-COMPILE_LANG_AND_ID test 931a6702f6 Tests: Factor out RunCMake.GenEx-COMPILE_LANGUAGE test Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4899
| * Tests: Factor out RunCMake.GenEx-GENEX_EVAL testBrad King2020-06-1630-9/+15
| | | | | | | | Move the `GENEX_EVAL` cases and friends out of `RunCMake.GeneratorExpression`.
| * Tests: Factor out RunCMake.GenEx-TARGET_FILE testBrad King2020-06-1675-31/+38
| | | | | | | | Move the `TARGET_FILE` cases and friends out of `RunCMake.GeneratorExpression`.
| * Tests: Factor out RunCMake.GenEx-DEVICE_LINK testBrad King2020-06-1644-15/+21
| | | | | | | | Move the `DEVICE_LINK` cases out of `RunCMake.GeneratorExpression`.
| * Tests: Factor out RunCMake.GenEx-HOST_LINK testBrad King2020-06-1644-15/+21
| | | | | | | | Move the `HOST_LINK` cases out of `RunCMake.GeneratorExpression`.
| * Tests: Factor out RunCMake.GenEx-LINK_LANG_AND_ID testBrad King2020-06-1639-12/+18
| | | | | | | | Move the `LINK_LANG_AND_ID` cases out of `RunCMake.GeneratorExpression`.
| * Tests: Factor out RunCMake.GenEx-LINK_LANGUAGE testBrad King2020-06-1642-13/+19
| | | | | | | | Move the `LINK_LANGUAGE` cases out of `RunCMake.GeneratorExpression`.
| * Tests: Factor out RunCMake.GenEx-COMPILE_LANG_AND_ID testBrad King2020-06-1627-8/+14
| | | | | | | | Move the `COMPILE_LANG_AND_ID` cases out of `RunCMake.GeneratorExpression`.
| * Tests: Factor out RunCMake.GenEx-COMPILE_LANGUAGE testBrad King2020-06-1627-8/+14
|/ | | | Move the `COMPILE_LANGUAGE` cases out of `RunCMake.GeneratorExpression`.
* Merge topic 'gitlab-ci-restructure' into release-3.18Brad King2020-06-156-555/+663
|\ | | | | | | | | | | | | | | | | | | | | 6d168c41e3 gitlab-ci: split linux and macos shared before scripts a1fe6ad621 gitlab-ci: use `extends` fda8b79f88 gitlab-ci: add a comment describing what goes into a job 2b4523c5f2 gitlab-ci: make rules a bit more uniform d6fe877cf9 gitlab-ci: split into multiple files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4885
| * gitlab-ci: split linux and macos shared before scriptsBen Boeckel2020-06-124-48/+76
| | | | | | | | | | They're not actually the same anyways and the anchors can't be shared between the files. We can figure out refactoring in the future.
| * gitlab-ci: use `extends`Ben Boeckel2020-06-127-135/+135
| | | | | | | | YAML anchors are not supported across include files.
| * gitlab-ci: add a comment describing what goes into a jobBen Boeckel2020-06-121-0/+16
| |
| * 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
| | |
generated by cgit v0.12 at 2024-12-28 22:05:53 (GMT)