summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* FindPython: manage SOABI for all Python versionsMarc Chevrier2020-08-111-12/+4
| | | | Fixes: #21070
* Merge topic 'FPHSA-name-mismatches-chained-via-include' into release-3.18Brad King2020-08-107-0/+52
|\ | | | | | | | | | | | | | | 98844ec9db FPHSA: detect inclusion between find modules Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Logan Barnes <barneslt63@gmail.com> Merge-request: !5107
| * 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
* | Merge topic 'FindRuby-restore-include-path' into release-3.18Brad King2020-08-101-2/+1
|\ \ | | | | | | | | | | | | | | | | | | 6959744131 FindRuby: Restore compatibility variable RUBY_INCLUDE_PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5109
| * | FindRuby: Restore compatibility variable RUBY_INCLUDE_PATHBrad King2020-08-071-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit e672db628b (FindRuby: Rename variables to match case of module name, 2020-03-11, v3.18.0-rc1~546^2), the result variables named with the old `RUBY_` prefix are provided by compatibility code that maps from the new `Ruby_` prefix variables. There is no `Ruby_INCLUDE_PATH` variable, so do not try to map it to `RUBY_INCLUDE_PATH`. The latter is provided by dedicated compatibility code left from before that transition. Fixes: #21064
* | | Merge topic 'FindPython-user-policies' into release-3.18Brad King2020-08-101-8/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a92d384548 FindPython: ensure user's policies are respected Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Henry Schreiner <henryschreineriii@gmail.com> Merge-request: !5098
| * | | FindPython: ensure user's policies are respectedMarc Chevrier2020-08-071-8/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not set the policy version before recording our internal macros such as `__Python_add_library`. Otherwise callers get our policy version instead of theirs. Instead just set the specific policies we need. Also fix one case in our test suite where we were accidentally relying on the policy version to be set by `FindPython`. Fixes: #21042
* | | GoogleTest: Restore support for list arguments in TEST_EXECUTORLaurits Riple2020-08-031-2/+2
|/ / | | | | | | | | | | Refactoring in commit 889a7146ff (GoogleTestAddTests: Refactor into callable method, 2020-03-16, v3.18.0-rc1~450^2~3) accidentally parsed `TEST_EXECUTOR` as a single-value argument instead of a list.
* | Merge topic 'clang-msvc-cxx-std' into release-3.18Brad King2020-07-301-5/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | 21e497fe63 Clang: Fix fallback compile features when simulating old MSVC versions Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !5082
| * | Clang: Fix fallback compile features when simulating old MSVC versionsBrad King2020-07-291-5/+5
| |/ | | | | | | | | | | | | | | Refactoring in commit 25439c7d62 (Clang: Refactor CXX standard flags into __compiler_clang_cxx_standards(), 2020-03-16, v3.18.0-rc1~362^2~4) accidentally broke the `cxx_std_*` fallback feature names. Issue: #21033
* | FindCURL: Fix list index check after searchMike Gelfand2020-07-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix logic added by commit fc5afbe970 (FindCURL: support COMPONENTS to check features, 2018-11-28, v3.14.0-rc1~287^2~2). When searching for particular components and `curl-config` reports one of the components being searched for first in the list, `find_package` fails. This is due to the check that treats non-zero index in the list as success and zero index as failure, while documentation on `list(FIND)` states that failure to find an element results in return value of -1 (not 0). I'm hitting this when building cURL with support for HTTP and HTTPS protocols only, and then trying to `find_package(CURL COMPONENTS HTTP HTTPS)`. I'm using `if(NOT x EQUAL -1)` check form as it appears to be the most used throughout the modules. While fixing this issue I've looked through all the uses of `list(FIND)` in other modules but wasn't able to find improper use except here.
* | Compilers: Ignore -print-sysroot prefix when it is '/'Brad King2020-07-271-1/+3
| | | | | | | | | | | | | | | | | | | | Since commit 8cc384f629 (Compilers: Add paths from -print-sysroot to system prefix path, 2020-03-25, v3.18.0-rc1~337^2) we prepend the compiler's sysroot to `CMAKE_SYSTEM_PREFIX_PATH`. This does not make sense when the prefix is just `/`, such as on Ubuntu 16.04's system compiler. Fixes: #21019
* | Merge topic 'externalproject-download-git-2.20-fix' into release-3.18Brad King2020-07-271-1/+5
|\ \ | | | | | | | | | | | | | | | | | | 8dbefc3ca6 ExternalProject: omit --no-checkout from git clone when using git 2.20.x. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5054
| * | ExternalProject: omit --no-checkout from git clone when using git 2.20.x.Nate Avers2020-07-241-1/+5
| |/ | | | | | | | | | | | | | | | | The optimization from commit 627fc5b44f (ExternalProject: Avoid unnecessary checkout on clone, 2019-07-29, v3.16.0-rc1~325^2) triggers a bug in the Git 2.20.x series that is not in older or newer versions. Drop the optimization for that specific range of Git versions. Fixes: #21009
* | Merge topic 'FindXalanC-1.12' into release-3.18Brad King2020-07-271-3/+3
|\ \ | | | | | | | | | | | | | | | | | | 4bf102418b FindXalanC: Fix version parsing for XalanC 1.12 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5056
| * | FindXalanC: Fix version parsing for XalanC 1.12Brad King2020-07-241-3/+3
| |/ | | | | | | | | | | The version header now puts parentheses around the components. Fixes: #21010
* | Xcode: Explicitly specify default native architecture on macOSBrad King2020-07-202-0/+7
|/ | | | | | | | | | | When `CMAKE_OSX_ARCHITECTURES` is not specified, we add the Xcode setting `ONLY_ACTIVE_ARCH = YES` with the intention of targeting the native architecture of the host. However, the default `ARCHS` value chosen by "Xcode 12 Universal Apps" includes multiple architectures. Add an explicit `ARCHS` setting with value `$(NATIVE_ARCH_ACTUAL)` to tell Xcode to use the host's native architecture only. Fixes: #20893
* 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
generated by cgit v0.12 at 2024-12-29 15:51:02 (GMT)