summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'irsl-intel-ia32'Brad 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'Brad 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 'FindMatlab-unknown-version'Brad King2020-07-091-1/+4
|\ \ | | | | | | | | | | | | | | | | | | a3c389cb17 FindMatlab: set MATLAB_DEFAULT_RELEASE for unknown version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4986
| * | FindMatlab: set MATLAB_DEFAULT_RELEASE for unknown versionAlexey Kreschuk2020-07-081-1/+4
| | | | | | | | | | | | | | | | | | | | | An "unknown" version does not always mean an old version. Setting this macro by mistake does not result in a compilation error, but not setting it does. I had this error when compiling from a user that does not have a matlab license.
* | | Merge topic 'cpack2'Brad King2020-07-091-3/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ca9bd43f2d Help: Duplicate essential information on install paths in CPack. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4987
| * | | Help: Duplicate essential information on install paths in CPack.Joachim Wuttke (h)2020-07-081-3/+7
| | | |
* | | | Merge topic 'FindJava-no-macos-stub'Brad 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'Brad 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 '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
| * \ \ \ \ 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
* | \ \ \ \ \ Merge topic 'doc-CPack-source-package'Brad 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'Brad 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 '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
* | \ \ \ \ \ Merge topic 'cuda-11-compute-arch'Brad 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'Brad 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 'doc-versionadded'Brad King2020-07-0742-0/+84
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 496ec6036f Help: Add Sphinx 'versionadded' directives to each top-level document 0c87afceab Help/dev: Add maintainer guide step for 'versionadded' documentation markup dbd453c2ff Utilities/Sphinx: Add script for inserting ".. versionadded" directive Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex Turbov <i.zaufi@gmail.com> Merge-request: !4947
| * | | | | Help: Add Sphinx 'versionadded' directives to each top-level documentKitware Robot2020-07-0642-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run the `Utilities/Sphinx/update_versions.py` script to add initial markup to every top-level document and find module. Issue: #19715
* | | | | | Merge topic 'FindMPI-nvcc-fexceptions'Brad 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
* | | | | Merge topic 'darwin-init-var-cleanup'Brad King2020-07-031-9/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2af6857562 Darwin: prefix internal osx variables with "_" to hide them from users Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4967
| * | | | | Darwin: prefix internal osx variables with "_" to hide them from usersChuck Cranor2020-07-031-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A simple CMakeLists.txt on osx shows that variable "d" is set (but empty) by the system modules. this pollutes the user's variable namespace. I noticed this when I created a library target "d" and got unexpected policy CMP0054 warnings when trying to find_package(d CONFIG REQUIRED) (triggered from the generated "d-targets.cmake" ...). Note that non-"_" prefixed internal variables are ok within functions due to scoping rules. Fixes: #20898
* | | | | | Merge topic 'find-libraries-NAMES_PER_DIR'Brad King2020-07-0314-10/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0d9d8dd054 FindPNG use NAMES_PER_DIR e6908b65b4 FindGIF use NAMES_PER_DIR 45ea7f9c80 FindGLEW use NAMES_PER_DIR 8e671f2564 FindLAPACK use NAMES_PER_DIR ec6bbfd58d FindIntl use NAMES_PER_DIR 667a229e8d FindProtobuf use NAMES_PER_DIR 64d37b4953 FindLibLZMA use NAMES_PER_DIR 9d2c119ff5 FindJPEG use NAMES_PER_DIR ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4961
| * | | | | | FindPNG use NAMES_PER_DIRSibi Siddharthan2020-07-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
| * | | | | | FindGIF use NAMES_PER_DIRSibi Siddharthan2020-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
| * | | | | | FindGLEW use NAMES_PER_DIRSibi Siddharthan2020-07-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
| * | | | | | FindLAPACK use NAMES_PER_DIRSibi Siddharthan2020-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
| * | | | | | FindIntl use NAMES_PER_DIRSibi Siddharthan2020-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
| * | | | | | FindProtobuf use NAMES_PER_DIRSibi Siddharthan2020-07-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
| * | | | | | FindLibLZMA use NAMES_PER_DIRSibi Siddharthan2020-07-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
| * | | | | | FindJPEG use NAMES_PER_DIRSibi Siddharthan2020-07-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
| * | | | | | FindIconv use NAMES_PER_DIRSibi Siddharthan2020-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
| * | | | | | FindEXPAT use NAMES_PER_DIRSibi Siddharthan2020-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
| * | | | | | FindCURL use NAMES_PER_DIRSibi Siddharthan2020-07-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
| * | | | | | FindBZip2 use NAMES_PER_DIRSibi Siddharthan2020-07-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
| * | | | | | FindBLAS use NAMES_PER_DIRSibi Siddharthan2020-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
| * | | | | | FindArmadillo use NAMES_PER_DIRSibi Siddharthan2020-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
* | | | | | | Merge topic 'FindGTest-no_release_support'Brad King2020-07-021-12/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a064b18f85 FindGTest: Allow either "Debug" or "Release" configurations. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4950
| * | | | | | | FindGTest: Allow either "Debug" or "Release" configurations.William Reid Paape2020-06-301-12/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call select_library_configurations on GTest library variable basenames "GTEST" and "GTEST_MAIN" before passing ${basename}_LIBRARY variables to find_package_handle_standard_args. This allows either _DEBUG or _RELEASE library variants to be found for find_package() to pass, whereas the original version would require the presence of _RELEASE variants. Fixes: #17799
* | | | | | | | Merge topic 'FindLua-5.4'Brad King2020-07-021-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | bbb7f0e271 FindLua: Add support for Lua 5.4 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4959
| * | | | | | 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