summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CUDA: Simplify CMAKE_CUDA_COMPILER_TOOLKIT_ROOT computationBrad King2020-06-181-1/+1
|
* CUDA: Skip the entire search for nvcc when it is CMAKE_CUDA_COMPILERBrad King2020-06-181-80/+80
|
* CUDA: Fix NVCC executable search during compiler detectionRaul Tambre2020-06-181-7/+1
| | | | | | | | The result variable was `CUDAToolkit_NVCC_EXECUTABLE` instead of `_CUDA_NVCC_EXECUTABLE`, which the rest of the code used. Also, we can simply `set()` the `_CUDA_NVCC_EXECUTABLE` value without searching. Fixes: #20847
* Merge topic 'improve_device_link_policy_cross_ref' into release-3.18Brad King2020-06-182-5/+7
|\ | | | | | | | | | | | | e5279c2c8f Help: Better document that CMP0105 controls DEVICE_LINK parsing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4919
| * Help: Better document that CMP0105 controls DEVICE_LINK parsingRobert Maynard2020-06-182-5/+7
| |
* | Merge topic 'doc-3.18-fixups' into release-3.18Brad King2020-06-188-31/+35
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 947cfc732d Help: Explicitly say transaction, don't abbreviate to trans 90c73479bc Help: Correct and condense examples for VS_SOLUTION_DEPLOY 0420de10b5 Help: Add missing cross-referencing for generator expressions 013f7a2647 Help: Formatting, crossref for FRAMEWORK_MULTI_CONFIG_POSTFIX_<CONFIG> a12d53acf3 Help: Add missing PCH_WARN_INVALID docs and related cleanups 95a16f7805 Help: Fix formatting error and consistency for gtest_discover_tests() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4915
| * | Help: Explicitly say transaction, don't abbreviate to transCraig Scott2020-06-181-2/+2
| | | | | | | | | | | | | | | The release notes need to make sense to people not so familiar with each item. For those less familiar with RPM, spelling out "transaction" makes this line item much clearer in isolation.
| * | Help: Correct and condense examples for VS_SOLUTION_DEPLOYCraig Scott2020-06-181-8/+6
| | |
| * | Help: Add missing cross-referencing for generator expressionsCraig Scott2020-06-183-3/+3
| | |
| * | Help: Formatting, crossref for FRAMEWORK_MULTI_CONFIG_POSTFIX_<CONFIG>Craig Scott2020-06-181-11/+12
| | |
| * | Help: Add missing PCH_WARN_INVALID docs and related cleanupsCraig Scott2020-06-183-3/+8
| | |
| * | Help: Fix formatting error and consistency for gtest_discover_tests()Craig Scott2020-06-181-4/+4
| | |
* | | Merge topic 'armclang-typo' into release-3.18Brad King2020-06-181-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2ff68c00e0 ARMClang: Fix typo in -Xlinker flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4916
| * | | ARMClang: Fix typo in -Xlinker flagOsama Moharam2020-06-181-1/+1
| |/ / | | | | | | | | | | | | Fix a typo from commit ef816610be (ARMClang: allow fallback to -march and correct setting of --cpu flags, 2020-06-03, v3.18.0-rc1~18^2).
* | | Merge topic 'test-split-RunCMake.target_link_libraries' into release-3.18Brad King2020-06-1840-69/+202
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 5f97e44912 Tests: Shorten case names in RunCMake.target_link_libraries-* tests 0951b1fe07 Tests: Split RunCMake.target_link_libraries test Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4908
| * | Tests: Shorten case names in RunCMake.target_link_libraries-* testsBrad King2020-06-1718-31/+31
| | | | | | | | | | | | | | | Drop the portion of the case names that repeats the name of the containing test.
| * | Tests: Split RunCMake.target_link_libraries testMarc Chevrier2020-06-1740-68/+201
| | | | | | | | | | | | Fixes: #20836
* | | Merge topic 'doc-relnotes' into release-3.18Brad King2020-06-171-8/+8
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 4f6ce41446 Help: Fix order of FindCUDAToolkit entry in 3.18 release notes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4910
| * | Help: Fix order of FindCUDAToolkit entry in 3.18 release notesBrad King2020-06-171-8/+8
|/ /
* | 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.
generated by cgit v0.12 at 2025-01-04 02:52:00 (GMT)