summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'CUDAToolkit-cuda-11'Brad 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 branch 'release-3.18'Brad King2020-06-190-0/+0
|\ \
| * \ 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
* | \ \ Merge topic 'cuda-toolkit-vs'Brad 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 branch 'release-3.18'Brad King2020-06-190-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | 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
* | | | Merge topic 'cuda_nvcc_exe_search'Brad 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
* | | CMake Nightly Date StampKitware Robot2020-06-191-1/+1
| | |
* | | Merge branch 'release-3.18'Brad King2020-06-180-0/+0
|\ \ \ | |/ /
| * | 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
* | \ \ Merge topic 'improve_device_link_policy_cross_ref'Brad 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 branch 'release-3.18'Brad King2020-06-180-0/+0
|\ \ \ | | |/ | |/|
| * | 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
* | \ \ Merge topic 'doc-3.18-fixups'Brad 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 'xcode-link-libs'Brad King2020-06-182-31/+187
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 58c05e1c73 Xcode: Use "Link Binary With Libraries" build phase when possible 927373b678 Xcode: Refactor generator variable names and types Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4882
| * | | | Xcode: Use "Link Binary With Libraries" build phase when possibleGusts Kaksis2020-06-172-17/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try linking all target linked libraries through frameworks build phase instead of linker flags, thus letting Xcode manage build product paths correctly. Prevent adding duplicate entries to "Link Binary With Libraries" build phase. Add check for configuration-dependent linking - in case the library is not present in all configurations revert back to linker flags which are per-configuration. This does change the order of libraries linked, but that does not seem to matter for Apple linkers invoked by Xcode, even for static libraries. The linker will go back and re-consider a static library from earlier on the link line when more symbols from its objects are needed. Fixes: #14185
| * | | | Xcode: Refactor generator variable names and typesGusts Kaksis2020-06-152-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | * Instead of `classes` use name `commonSourceFiles`. * No need for reference when you have pointer.
* | | | | Merge topic 'languageStandardRefactor'Brad King2020-06-188-107/+336
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 742ff97f80 Refactor language standard computation 0892c798f7 cmMakefile: Change CompileFeatureKnown to take target name instead of target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4803
| * | | | | Refactor language standard computationJustin Goshi2020-06-168-102/+330
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of mutating the configure-time cmTarget's properties at generate time, compute and store it in a cmGeneratorTarget field.
| * | | | | cmMakefile: Change CompileFeatureKnown to take target name instead of targetJustin Goshi2020-06-153-6/+7
| |/ / / / | | | | | | | | | | | | | | | The implementation needs only the target name.
* | | | | Merge topic 'configure_file-error-handling'Brad King2020-06-181-1/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 032506acc6 cmake: implement error handling in configure_file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4889
| * | | | | cmake: implement error handling in configure_fileAsit Dhal2020-06-171-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement error handling in case it fails Fixes: #20696
* | | | | | Merge topic 'mkl-lib-dir'Brad King2020-06-182-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d5a07ce76 FindLAPACK: Extend search directories for MKL d880d2805f FindBLAS: Extend search directories for MKL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4905
| * | | | | | FindLAPACK: Extend search directories for MKLevatux2020-06-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though Intel MKL typically puts the libraries under `$MKLROOT/lib/$arch_$os` some installations may still use `$MKLROOT/lib/$arch/` path. Ideally, `$arch` should be a symlink to `$arch_$os`, but sometimes the opposite happens (for instance, see Intel MKL distribution in Arch Linux [1]), and sometimes only `$arch` directory alone is present. This patch extends the search list with `$MKLROOT/lib/$arch` with lower priority than `$MKLROOT/lib/$arch_$os`, as the latter is the official path to Intel MKL libraries. It is also worth mentioning that Intel MKL Link Line Adviser [2] recommends using `$MKLROOT/lib/$arch` directory in a link line: ``` -L${MKLROOT}/lib/intel64 -Wl,--no-as-needed -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl ``` [1] https://www.archlinux.org/packages/community/x86_64/intel-mkl/files/ [2] https://software.intel.com/content/www/us/en/develop/articles/intel-mkl-link-line-advisor.html
| * | | | | | FindBLAS: Extend search directories for MKLevatux2020-06-161-0/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though Intel MKL typically puts the libraries under `$MKLROOT/lib/$arch_$os` some installations may still use `$MKLROOT/lib/$arch/` path. Ideally, `$arch` should be a symlink to `$arch_$os`, but sometimes the opposite happens (for instance, see Intel MKL distribution in Arch Linux [1]), and sometimes only `$arch` directory alone is present. This patch extends the search list with `$MKLROOT/lib/$arch` with lower priority than `$MKLROOT/lib/$arch_$os`, as the latter is the official path to Intel MKL libraries. It is also worth mentioning that Intel MKL Link Line Adviser [2] recommends using `$MKLROOT/lib/$arch` directory in a link line: ``` -L${MKLROOT}/lib/intel64 -Wl,--no-as-needed -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl ``` [1] https://www.archlinux.org/packages/community/x86_64/intel-mkl/files/ [2] https://software.intel.com/content/www/us/en/develop/articles/intel-mkl-link-line-advisor.html
* | | | | | Merge topic 'tutorial_install_when_built_static'Brad King2020-06-185-7/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0fdfd6bf37 Tutorial: Install correctly when built statically Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4906
| * | | | | | Tutorial: Install correctly when built staticallyRobert Maynard2020-06-165-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When built statically we failed to install the SqrtLibrary
* | | | | | | Merge topic 'tutorial_correct_step9_wording'Brad King2020-06-181-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7c3204fc7d Tutorial: Correct Step9 wording Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4907
| * | | | | | | Tutorial: Correct Step9 wordingRobert Maynard2020-06-161-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | on some platforms -fPIC is implicit so you won't get an error
* | | | | | | Merge topic 'refactor_try_compile_parsing'Brad King2020-06-182-292/+194
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 574f71efba try_compile: Refactor language standard level parsing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4900
| * | | | | | | try_compile: Refactor language standard level parsingRobert Maynard2020-06-172-292/+194
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmCoreTryCompile had significant code duplication around handling languages that offer standard levels. This refactoring reduces the complexity and makes it easier to add new languages in the future.
* | | | | | | Merge branch 'release-3.18'Brad King2020-06-180-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | 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
* | \ \ \ \ \ \ Merge topic 'armclang-typo'Brad 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 branch 'release-3.18'Brad King2020-06-180-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
generated by cgit v0.12 at 2025-09-07 10:11:55 (GMT)