summaryrefslogtreecommitdiff
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'versionadded'Brad King2020-12-03106-821/+1961
|\ | | | | | | | | | | | | | | | | | | | | | | | | 5000f93a91 Help: Fix grammar in `.. versionadded` directives 8fea95319b Help: Add `.. versionadded` directives to module docs 8634561dca Help: Improve formatting for FindBoost and FindCUDA ea59b0cd34 Help: Fix version note for CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE 05c3060b10 Help: Fix cmake_parse_arguments version note dafcef8b50 Help: Improve styling for versionadded/deprecated directives 6ae216daef Tests: Make RunCMake.CMP0106 expected output robust to line number changes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5560
| * Help: Add `.. versionadded` directives to module docsNikita Nemkin2020-12-02106-364/+1293
| | | | | | | | Issue: #19715
| * Help: Improve formatting for FindBoost and FindCUDANikita Nemkin2020-12-022-471/+682
| | | | | | | | | | | | | | | | | | * Split large literal blocks into definitions lists. * Add section headers. * Add links to standard commands and variables. * Use inline literals liberally. * Enable code highlighting in literal blocks. * Format command signatures according to modern conventions.
* | Merge topic 'llvm-rc-preprocess-as-c'Brad King2020-12-031-5/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | bdfa5ac7f6 Merge branch 'master' into llvm-rc-preprocess-as-c f7ff0d34f0 llvm-rc: Force C language for the clang gnu frontend Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5564
| * \ Merge branch 'master' into llvm-rc-preprocess-as-cBrad King2020-12-0287-278/+1197
| |\ \ | | |/
| * | llvm-rc: Force C language for the clang gnu frontendThomas Bernard2020-12-021-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | When preprocessing the rc file using the clang gnu front end we need to force the source file type to a c file for the preprocessing to take place. Fixes: #21472
* | | Merge topic 'ninja-deps-updates'Brad King2020-12-024-7/+52
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f8d8faff8d Ninja Generators: Homogenize configuration with Makefiles Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5557
| * | | Ninja Generators: Homogenize configuration with MakefilesMarc Chevrier2020-12-014-7/+52
| | | | | | | | | | | | | | | | | | | | * Use same configuration variables to configure dependencies * Abstract Ninja deps format from compiler one
* | | | Merge topic 'FindHDF5-hdf5hl_fortran-variable'Brad King2020-12-021-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 175beadd4c FindHDF5: support the hdf5hl_fortran-based variable names adf108441e FindHDF5: improve error messages when a location variable isn't known Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5563
| * | | | FindHDF5: support the hdf5hl_fortran-based variable namesBen Boeckel2020-12-011-0/+4
| | | | | | | | | | | | | | | | | | | | Fixes: #21537
| * | | | FindHDF5: improve error messages when a location variable isn't knownBen Boeckel2020-12-011-2/+2
| | |/ / | |/| |
* | | | Merge topic 'ti-c-only-standard'Brad King2020-12-021-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8eeddb1f0a Compiler/TI: Fix C standard flags in C-only project Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5558
| * | | | Compiler/TI: Fix C standard flags in C-only projectAdam Weisi2020-12-011-3/+3
| |/ / / | | | | | | | | | | | | Use our compiler architecture variable for C rather than CXX.
* | | | Merge topic 'cray-compiler-detection'Brad King2020-12-023-5/+5
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | 9ee4a42813 Cray: Fix Cray compiler detection on new platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5561
| * | | Cray: Fix Cray compiler detection on new platformsJustin LaPolla2020-12-013-5/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Customer reported problems detecting the Cray compiler on their Apollo80 system. We were checking for the __CRAYXC and __CRAYXE predefined macros. These macros reflect the platform that the compiler is running on, i.e. Cray XC and Cray XE machines. Naturally, this didn't work on Apollo80. This commit uses the official Cray compiler identification macros which are defined on every platform: CCE Version C Macro C++ Macro Fortran Macro ============ ======== ========= ============= version < 9 _CRAYC _CRAYC _CRAYFTN version >= 9 __cray__ __cray__ _CRAYFTN
| * | Merge topic 'windows-clang-LINKER-prefix' into release-3.19Brad King2020-12-011-0/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 9ac9876757 Clang on Windows: 'LINKER:' prefix must be honored Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5551
| * \ \ Merge topic 'correct_check_compiler_flag_regression' into release-3.19Brad King2020-11-303-7/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72f6b4bfbe Modules: Rename Internal/CMake{CheckCompiler => TryCompilerOrLinker}Flag Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kumar Gala <kumar.gala@gmail.com> Merge-request: !5540
| * \ \ \ Merge topic 'check-lang-conditions' into release-3.19Brad King2020-11-303-20/+20
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f3d4254b3d Check*: Tolerate variables set with names of languages 01d91ae5f2 Tests: Fix RunCMake.Check* conditions for enabling Fortran Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !5536
* | \ \ \ \ Merge topic 'cuda_env_archs'Brad King2020-12-011-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c57541d874 CUDA: Fix tests with CUDAARCHS set c4ae9384ff CUDA: Initialize CMAKE_CUDA_ARCHITECTURES using $ENV{CUDAARCHS} Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5533
| * | | | | | CUDA: Initialize CMAKE_CUDA_ARCHITECTURES using $ENV{CUDAARCHS}Raul Tambre2020-11-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NVCC's default architecture may be newer than the one supported by the machine's GPU. In such cases it's useful to have an environment variable for initializing CMAKE_CUDA_ARCHITECTURES to avoid specifying it for every invocation.
* | | | | | | Merge topic 'Help-FindPython-add-version-information'Brad King2020-12-013-40/+242
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ee6f37d606 Help: FindPython: add version information Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5554
| * | | | | | | Help: FindPython: add version informationMarc Chevrier2020-12-013-40/+242
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge topic 'windows-clang-LINKER-prefix'Brad King2020-12-011-0/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | 9ac9876757 Clang on Windows: 'LINKER:' prefix must be honored Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5551
| * | | | | Clang on Windows: 'LINKER:' prefix must be honoredMarc Chevrier2020-11-301-0/+3
| | |/ / / | |/| | | | | | | | | | | | | Fixes: #21094
| * | | | Merge topic 'FPHSA-usable-outside-find_package' into release-3.19Marc Chevrier2020-11-281-2/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 14ecf9c2f6 FPHSA: ensure it can be used outside 'find_package' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5539
* | \ \ \ \ Merge topic 'makefiles-compiler-deps-optims'Brad King2020-11-3035-20/+242
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c71d051fa Makefiles Generators: use compiler for dependencies generation afd0f6785d Refactoring: Abstract Makefile line continuation format b6068ce407 Refactoring: enhance include file filtering 3401403f69 Refactoring: Introduce place-holder for dependency target. a97c41bf8b Refactoring: Makefiles Generators: Add support for various depends scanners Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !5528
| * | | | | | Makefiles Generators: use compiler for dependencies generationMarc Chevrier2020-11-2925-1/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each source compilation generates a dependencies file. These dependencies files are consolidated in one file per target. This consolidation is done as part of command 'cmake -E cmake_depends` launched before evaluation of makefile dependency graph. The consolidation uses the same approach as `CMake` dependencies management. Fixes: #21321
| * | | | | | Refactoring: Introduce place-holder for dependency target.Marc Chevrier2020-11-2817-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes are in preparation of compiler generated dependencies support for Makefiles generators * compiler output and dependency target can be different for Makefiles generators * resolve inconsistency naming for dependency file place-holder
* | | | | | | Merge topic 'correct_check_compiler_flag_regression'Brad King2020-11-303-7/+8
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72f6b4bfbe Modules: Rename Internal/CMake{CheckCompiler => TryCompilerOrLinker}Flag Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kumar Gala <kumar.gala@gmail.com> Merge-request: !5540
| * | | | | | Modules: Rename Internal/CMake{CheckCompiler => TryCompilerOrLinker}FlagRobert Maynard2020-11-253-7/+8
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the `CheckPIESupported` helper functions so that they don't clobber other internal functions. Also rename them to document they can't be unified with `CheckCompilerFlag`. Fixes: #21497
* | | | | | Merge topic 'check-lang-conditions'Brad King2020-11-303-20/+20
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | f3d4254b3d Check*: Tolerate variables set with names of languages 01d91ae5f2 Tests: Fix RunCMake.Check* conditions for enabling Fortran Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !5536
| * | | | Check*: Tolerate variables set with names of languagesBrad King2020-11-253-20/+20
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the language checks added by commit 90dead024c (CheckCompilerFlag: unified way to check compiler flags per language, 2020-09-25, v3.19.0-rc1~88^2), commit 10ae907de0 (CheckSoureCompiles: Add a unified way to check if a source compiles, 2020-09-14, v3.19.0-rc1~118^2~1), and commit 357e2ef429 (CheckSoureRuns: Add a unified way to check if a source runs, 2020-09-14, v3.19.0-rc1~118^2) to work when variables of the language names are set. Fixes: #21500
| * | | Merge topic 'cuda_detect_vs_codegen' into release-3.19Brad King2020-11-251-4/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20807a1882 CUDA: Fix user-set architectures during detection with Visual Studio Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5531
| * \ \ \ Merge topic 'cuda_11' into release-3.19Brad King2020-11-231-4/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 046e454fdd CUDA: Error if can't determine toolkit library root 440dc98b07 CUDA: Clang CUDA 11.1 support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5525
| * \ \ \ \ Merge topic 'FindGTest-revert-no-release' into release-3.19Brad King2020-11-231-28/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64dc4efc51 FindGTest: Revert "Allow either "Debug" or "Release" configurations." Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5520
* | \ \ \ \ \ Merge topic 'ctest-less-findy'Craig Scott2020-11-281-9/+8
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 705e31a31b CTest: only look for update executables when needed Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5542
| * | | | | | CTest: only look for update executables when neededSeth R Johnson2020-11-261-9/+8
| | | | | | |
* | | | | | | Merge topic 'FPHSA-usable-outside-find_package'Marc Chevrier2020-11-281-2/+7
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 14ecf9c2f6 FPHSA: ensure it can be used outside 'find_package' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5539
| * | | | | | FPHSA: ensure it can be used outside 'find_package'Marc Chevrier2020-11-251-2/+7
| | |/ / / / | |/| | | | | | | | | | | | | | | | Fixes: #21505
* | | | | | Merge topic 'cuda_detect_vs_codegen'Brad King2020-11-251-4/+8
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 20807a1882 CUDA: Fix user-set architectures during detection with Visual Studio Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5531
| * | | | | CUDA: Fix user-set architectures during detection with Visual StudioRaul Tambre2020-11-251-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the user specifies CMAKE_CUDA_ARCHITECTURES we use those during detection and error out if they don't work. For Visual Studio a dummy project file is used instead of invoking the compiler directly. NVCC would thus use its default and we'd fail if CMAKE_CUDA_ARCHITECTURES was anything other than NVCC's default. Use the necessary project file variable in CMakeDetermineCompilerId.cmake to match other generators. Fixes #21492.
* | | | | | Merge topic 'cuda_11'Brad King2020-11-231-4/+6
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 046e454fdd CUDA: Error if can't determine toolkit library root 440dc98b07 CUDA: Clang CUDA 11.1 support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5525
| * | | | | CUDA: Error if can't determine toolkit library rootRaul Tambre2020-11-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Finding the toolkit is required for Clang and is assumed to have been correctly found by FindCUDAToolkit if the CUDA language is found. Error out early with an useful error instead of failing later on due to the path not being set.
| * | | | | CUDA: Clang CUDA 11.1 supportRaul Tambre2020-11-221-4/+4
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | version.txt is gone from CUDA 11.1 installations, but the rest is the same. Instead of looking for version.txt look for <CUDA path>/nvvm/libdevice, which is the main thing that Clang requires (though it also checks for the existence of bin and include). Fixes #21353.
* | | | | Merge branch 'master' into FindGTest-revert-no-releaseBrad King2020-11-2065-236/+707
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge topic 'revert-explicit-LANGUAGE-flag'Brad King2020-11-2012-24/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | 30aa715fac Revert "specify language flag when source LANGUAGE property is set" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5519
| | * | | Revert "specify language flag when source LANGUAGE property is set"Brad King2020-11-1912-24/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 74b1c9fc8e (Explicitly specify language flag when source LANGUAGE property is set, 2020-06-01, v3.19.0-rc1~722^2) and the lookup tables from its two immediate ancestors. The purpose of that change was to convert an explicit `LANGUAGE` source file property into an explicit language specification compiler flag like `-x c`. This seems reasonable since the property is documented as meaning "indicate what programming language the source file is". It is also needed to help compilers deal with non-standard source file extensions they don't recognize. However, some projects have been setting `LANGUAGE C` on `.S` assembler source files to mean "use the C compiler". Passing `-x c` for them breaks the build because the `.S` sources are not written in C. These projects should be updated to use `enable_language(ASM)`, for which CMake often chooses the C compiler as the assembler when using toolchains that support it (which would have to be the case for projects using the approach). Revert the change for now to preserve the old behavior for such projects. We can re-introduce it with a policy in a future version of CMake. Fixes: #21469 Issue: #14516, #20716
| * | | | Merge topic 'rename_cuda_memcheck'Brad King2020-11-181-2/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | fea49b2df0 CTest: Rename CudaMemcheck to CudaSanitizer Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5514
| * | | | CPack/DEB: Do not crash when asked for debug symbols when there are noneAndrew Fuller2020-11-161-0/+4
| | | | | | | | | | | | | | | | | | | | Fixes: #21356
| * | | | MSVC: Do not add /GR to CMAKE_CXX_FLAGS by defaultBrad King2020-11-131-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `/GR` flag has been on by default since MSVC cl 14.0 from VS 2005. Remove it from the default flags to make it easier for projects to pass `/GR-` themselves to turn it off. Projects may be using string processing to replace `/GR` with another flag, so we cannot simply drop it. Add a policy to drop it in a compatible way. Fixes: #21428