summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fix-win-flex-bison' into release-3.18Brad King2020-06-232-2/+2
|\ | | | | | | | | | | | | 0faa2b9870 Find{FLEX,BISON}: Add 'win-' executable names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4931
| * Find{FLEX,BISON}: Add 'win-' executable namesYan2020-06-222-2/+2
| | | | | | | | | | Distributions of these tools on Windows now use a `win-` prefix instead of the previously-seen `win_` prefix. Search for both.
* | Merge topic 'FindCUDA-11' into release-3.18Brad King2020-06-231-2/+5
|\ \ | | | | | | | | | | | | | | | | | | 1d9f2f9714 FindCUDA: Do not search for the deprecated nppicom when CUDA >= 11 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4929
| * | FindCUDA: Do not search for the deprecated nppicom when CUDA >= 11Robert Maynard2020-06-221-2/+5
| | | | | | | | | | | | | | | | | | | | | The nppicom library has been removed in preference of nvjpeg starting in CUDA 11. Fixes: #20845
* | | Merge topic 'test-all-find-modules' into release-3.18Brad King2020-06-233-35/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 6c6b227813 Tests: Drop redundant FindModulesExecuteAll test Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4930
| * | | Tests: Drop redundant FindModulesExecuteAll testBrad King2020-06-233-35/+0
| |/ / | | | | | | | | | | | | This test has been superseded by `CMakeOnly.AllFindModules`, which does much more checking anyway.
* | | Merge topic 'try_compile-nfs' into release-3.18Brad King2020-06-191-1/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9a258c302 try_compile: Do not try to remove '.nfs*' files Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Acked-by: Axel Huebl <axel.huebl@plasma.ninja> Merge-request: !4913
| * | | try_compile: Do not try to remove '.nfs*' filesBrad King2020-06-171-1/+3
| |/ / | | | | | | | | | | | | | | | | | | These files are part of the NFS implementation and should not be removed. They will automatically disappear when NFS is done with them. Fixes: #20844
* | | Merge topic 'CUDAToolkit-cuda-11' into release-3.18Brad King2020-06-193-7/+38
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b284a3c764 CudaToolkit: Update for new/removed libraries in CUDA 11 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4917
| * | | CudaToolkit: Update for new/removed libraries in CUDA 11Robert Maynard2020-06-183-7/+38
| |/ /
* | | Merge topic 'cuda-toolkit-vs' into release-3.18Brad King2020-06-191-121/+130
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a0280801f4 CUDA: Fix CMAKE_CUDA_COMPILER_TOOLKIT_ROOT detection in Visual Studio 90be0916b5 CUDA: Re-order some logic for determining the compiler 4ab5f109f0 CUDA: Remove unused variables while determining compiler 492e5f01fa CUDA: Simplify CMAKE_CUDA_COMPILER_TOOLKIT_ROOT computation 4785bd6153 CUDA: Skip the entire search for nvcc when it is CMAKE_CUDA_COMPILER Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4921
| * | | CUDA: Fix CMAKE_CUDA_COMPILER_TOOLKIT_ROOT detection in Visual StudioBrad King2020-06-181-108/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using a Visual Studio generator, we do not know the path to `CMAKE_CUDA_COMPILER` until after the compiler id detection project extracts it. However, based on the VS toolchain configuration we know that the compiler id will be NVIDIA, so use that to drive the CUDA architecture flag logic. After the main compiler id step we know `CMAKE_CUDA_COMPILER`, so `CMAKE_CUDA_COMPILER_TOOLKIT_ROOT` can then be computed.
| * | | CUDA: Re-order some logic for determining the compilerBrad King2020-06-181-11/+9
| | | |
| * | | CUDA: Remove unused variables while determining compilerBrad King2020-06-181-2/+0
| | | |
| * | | 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
| | | |
* | | | Merge topic 'cuda_nvcc_exe_search' into release-3.18Brad King2020-06-191-7/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | d9c1f05924 CUDA: Fix NVCC executable search during compiler detection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4920
| * | | 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`.