summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* FPHSA: detect inclusion between find modulesBen Boeckel2020-08-077-0/+52
| | | | | | | | | | Various find modules include each other to delegate finding some subset or variant of the package. Ideally, these would use `find_dependency` or some other actual `find_package` mechanism, but that is a larger change. Instead, just detect inclusion and suppress FPHSA name mismatch warnings. Fixes: #21060
* NVCC: Handle host compiler with spaces in pathRaul Tambre2020-07-141-2/+2
| | | | | | | Need to surround it with quotes otherwise the different bits are passed as separate arguments. Fixes #20954.
* Merge topic 'irsl-intel-ia32' into release-3.18Brad King2020-07-101-1/+1
|\ | | | | | | | | | | | | f332ce12d6 IRSL: Fix path to Intel 32-bit redist libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4995
| * IRSL: Fix path to Intel 32-bit redist librariesTorgeir Rusten2020-07-091-1/+1
| | | | | | | | | | | | The path to the 32 bit libraries in the Intel windows/redist folder use ia32. I don't remember if this has changed at some point, but ia32 has been used at least since Intel Fortran XE 2018.
* | Merge topic 'FindOpenMP-version' into release-3.18Brad King2020-07-101-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 656d6ea821 FindOpenMP: Set version variables every time CMake runs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4996
| * | FindOpenMP: Set version variables every time CMake runsBrad King2020-07-091-1/+1
| |/ | | | | | | | | | | | | | | | | The version is determined in two steps. First, the "spec date" is detected and cached. Second, the date is converted to a version. Move the second step out of the spec date cache guard condition so that it runs every time even if the spec date is already cached. Fixes: #19150
* | Merge topic 'FindJava-no-macos-stub' into release-3.18Brad King2020-07-091-3/+2
|\ \ | | | | | | | | | | | | | | | | | | e8051b1f20 FindJava: Update check to avoid accepting macOS stub 'java' as Java Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4993
| * | FindJava: Update check to avoid accepting macOS stub 'java' as JavaBrad King2020-07-081-3/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit dd378258f1 (FindJava: Do not accept OS X stub 'java' as Java, 2014-10-24, v3.1.0-rc3~29^2) we try to avoid using the macOS `/usr/bin/java` stub if no underlying implementation of Java is actually installed. However, the message that `/usr/bin/java` prints when there is no Java available has changed since then. Update our check to also look for the new message. While at it, revise the way we suppress `Java_JAVA_EXECUTABLE`. Previously we set its cache entry to `Java_JAVA_EXECUTABLE-NOTFOUND`, but that would cause the same find-and-reject sequence to be followed every time CMake runs in a build tree. Instead, use the approach from commit 2c0db404d1 (FindSubversion: Do not accept macOS stub without Xcode implementation, 2020-05-28, v3.18.0-rc1~67^2). Leave the cache entry alone and just set a normal variable of the same name to hide it.
* | Merge topic 'cuda-11-ptx-arch' into release-3.18Brad King2020-07-091-2/+2
|\ \ | | | | | | | | | | | | | | | | | | 8707178c1c FindCUDA/select_compute_arch: generate PTX for the latest architecture Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4991
| * | FindCUDA/select_compute_arch: generate PTX for the latest architecturezasdfg bnm2020-07-081-2/+2
| | |
* | | Merge topic 'doc-CPack-source-package' into release-3.18Brad King2020-07-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f8b7acaf90 Help: Fix CPack module docs on config file for source package Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4985
| * | | Help: Fix CPack module docs on config file for source packageJoachim Wuttke (h)2020-07-081-1/+1
| | |/ | |/|
* | | Merge topic 'FindMPI-nvcc-link-pthread' into release-3.18Brad King2020-07-081-0/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 33192e1b5f FindMPI: Pass -pthread to NVCC through -Xlinker for device linking Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4981
| * | FindMPI: Pass -pthread to NVCC through -Xlinker for device linkingRobert Maynard2020-07-071-0/+2
| | | | | | | | | | | | Fixes: #20924
* | | Merge topic 'cuda-11-compute-arch' into release-3.18Brad King2020-07-081-7/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 295d1b9cb5 FindCUDA/select_compute_arch: Add CUDA 11 and Ampere support Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Axel Huebl <axel.huebl@plasma.ninja> Acked-by: Tobias Ribizel <ribizel@kit.edu> Acked-by: Henry Schreiner <henryschreineriii@gmail.com> Merge-request: !4979
| * | | FindCUDA/select_compute_arch: Add CUDA 11 and Ampere supportzasdfg bnm2020-07-071-7/+27
| | |/ | |/| | | | | | | Co-Author: Henry Schreiner <henryschreineriii@gmail.com>
* | | Merge topic 'find-blas-lapack-mklroot-win' into release-3.18Brad King2020-07-082-2/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | 196f042b58 FindLAPACK: Handle Windows Intel MKLROOT with backslash 96c19ecd55 FindBLAS: Handle Windows Intel MKLROOT with backslash Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4982
| * | FindLAPACK: Handle Windows Intel MKLROOT with backslashMichael Hirsch2020-07-071-1/+1
| | |
| * | FindBLAS: Handle Windows Intel MKLROOT with backslashMichael Hirsch2020-07-071-1/+1
| |/
* | Merge topic 'FindMPI-nvcc-fexceptions' into release-3.18Brad King2020-07-071-1/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | b725a19072 FindMPI: Deny -fexceptions from NVCC Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !4970
| * | FindMPI: Deny -fexceptions from NVCCAxel Huebl2020-07-061-1/+3
| |/ | | | | | | | | | | Do not forward -fexceptions (set from MVAPICH2) to NVCC. Fixes: #18558
* | FindLua: Add support for Lua 5.4Felix Yan2020-07-011-1/+1
|/
* Merge topic 'gtest-xml-output' into release-3.18Brad King2020-06-291-1/+1
|\ | | | | | | | | | | | | 75aa3ee7e7 GoogleTest: Fix name generation for XML_OUTPUT_DIR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4942
| * GoogleTest: Fix name generation for XML_OUTPUT_DIRStefan Floeren2020-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Google test framework allows to write the results into an XML file since commit e9ab39eb1d (GoogleTest: Add XML_OUTPUT_DIR parameter, 2020-03-06, v3.18.0-rc1~538^2~2). This file is passed on the command line: `--gtest_output=xml:FILE_NAME`. The module allows to specify a directory to save those files with **TEST_XML_OUTPUT_PARAM**. If the option is set, the filename will be set to `${prefix}${pretty_suite}.${pretty_test}${suffix}.xml`. The pretty names contain parameters for the tests, if value-parameterized tests are used. These parameters may not be safe to use in file names. There are two possible options: 1. sanitize the file name 2. omit the values and use the internal numbering of gtest This commit chose option 2. The testname needs to be a valid C++ identifier and should therefore be reasonable for a filename. Note that the generated names contain slashes. This will lead to subdirectories, but works on both Linux and Windows. Fixes: #20877
* | Merge topic 'intel-c++20' into release-3.18Brad King2020-06-291-0/+10
|\ \ | | | | | | | | | | | | | | | | | | 99c8dbf497 Intel: Add flags for C++20 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4946
| * | Intel: Add flags for C++20Brad King2020-06-261-0/+10
| |/ | | | | | | | | Patch-by: Matheus Izvekov Fixes: #20880
* | GoogleTest: Replace SEND_ERROR with FATAL_ERRORCraig Scott2020-06-241-1/+1
| | | | | | | | We want to fail and halt immediately upon any error, not continue past a fatal problem.
* | Merge topic 'VxWorks-platform-id' into release-3.18Brad King2020-06-231-0/+3
|\ \ | | | | | | | | | | | | | | | | | | b22586be01 VxWorks: Add Platform ID for Modules/CMakePlatformId.h.in Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4922
| * | VxWorks: Add Platform ID for Modules/CMakePlatformId.h.inLihua Zhao2020-06-231-0/+3
| |/
* | 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 'CUDAToolkit-cuda-11' into release-3.18Brad King2020-06-191-1/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-181-1/+5
| |/ /
* | | 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
| | |
* | | 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 'doc-3.18-fixups' into release-3.18Brad King2020-06-181-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Fix formatting error and consistency for gtest_discover_tests()Craig Scott2020-06-181-4/+4
| |/ /
* | | 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).
* | 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 'cuda_clang_toolkit_path' into release-3.18Brad King2020-06-154-260/+415
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-123-123/+127
| | | | | | | | | | | | | | | Similar to how we already do for Clang. Avoids a lot of redundant work in FindCUDAToolkit.
| * | CUDA: Pass toolkit path to ClangRaul Tambre2020-06-122-235/+268
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
generated by cgit v0.12 at 2024-12-28 05:17:12 (GMT)