summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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
| * | | MSVC: Factor out initialization of /GR flagBrad King2020-11-131-4/+8
| | | |
| * | | Merge topic 'usejava_helpers'Brad King2020-11-134-25/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb28d9af1f UseJava: Move helper scripts to subdirectory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5501
| | * | | UseJava: Move helper scripts to subdirectoryNikita Nemkin2020-11-124-25/+7
| | | | | | | | | | | | | | | | | | | | Also, exclude them from the help module index.
| * | | | Merge topic 'android-abis'Brad King2020-11-131-61/+76
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a2bb717ee Android: load ABI information from abis.cmake Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5499
| | * | | | Android: load ABI information from abis.cmakeHaibo Huang2020-11-121-61/+76
| | |/ / / | | | | | | | | | | | | | | | | | | | | They are added to NDK and planned to release in r23: https://android-review.googlesource.com/c/platform/ndk/+/1493421
| * | | | Merge topic 'qtifw-archivegen'Brad King2020-11-131-0/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5ab75dd7dd CPack/IFW: Locate the archivegen utility Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5503
| * \ \ \ \ Merge topic 'qtifw-4.0'Brad King2020-11-131-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63ae96a317 CPack/IFW: Add support for QtIFW 4.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5502
| * \ \ \ \ \ Merge topic 'xcode-compiler-id-path'Brad King2020-11-134-4/+4
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bcbae3f71e Xcode: Extract CMAKE_<LANG>_COMPILER from compiler id with multiple archs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5506
| * | | | | | Merge topic 'xcode-compiler-id-arch'Brad King2020-11-132-2/+9
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98849039cc Xcode: Default to arm64 arch on Apple Silicon hosts during compiler id Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5505
| * \ \ \ \ \ \ Merge topic 'ctest-batch'Brad King2020-11-122-12/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa754e2913 CTest: Remove additional batch test variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5494
| | * | | | | | | CTest: Remove additional batch test variablesSeth R Johnson2020-11-112-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up commit f984296ba8 (CTest: Remove unfinished batch test mode, 2017-12-08, v3.11.0-rc1~217^2).
| * | | | | | | | Merge topic 'FindBLAS/OpenBLAS-OpenMP'Brad King2020-11-121-1/+7
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7f3d8987a FindBLAS: Add dependency of OpenBLAS on OpenMP for BLA_STATIC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5487
| | * | | | | | | | FindBLAS: Add dependency of OpenBLAS on OpenMP for BLA_STATICEisuke Kawashima2020-11-111-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #16221
| * | | | | | | | | Merge topic 'FindRuby-vs-runtimes'Brad King2020-11-121-7/+13
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d4a16427e2 FindRuby: Consider more VS runtime suffix combinations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5486
| * | | | | | | | | Merge topic 'FortranCInterface-CMP0056'Brad King2020-11-112-0/+18
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15e77fbd40 FortranCInterface: Honor CMAKE_EXE_LINKER_FLAGS under CMP0056 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5483
| | * | | | | | | | | FortranCInterface: Honor CMAKE_EXE_LINKER_FLAGS under CMP0056Brad King2020-11-102-0/+18
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Policy CMP0056 determines whether `CMAKE_EXE_LINKER_FLAGS` are passed into the test project used by the source-file signature of `try_compile`. That affects how implicit link directories are detected, so we need to also honor the policy for the source-directory signature of `try_compile` used in FortranCInterface in order to get matching link directories. Fixes: #21408
| * | | | | | | | | Merge topic 'android-abi'Brad King2020-11-111-4/+13
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a585b75df9 Android: Use NDK_KNOWN_DEVICE_ABI{32,64}S instead of NDK_DEFAULT_ABIS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5488
| * | | | | | | | | Merge topic 'android-root'Brad King2020-11-101-32/+14
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cbc51a8be3 Android: restructure android search paths Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: huangqinjin <huangqinjin@gmail.com> Merge-request: !5479
| | * | | | | | | | | Android: restructure android search pathsHaibo Huang2020-11-091-32/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Set CMAKE_FIND_ROOT_PATH unconditionally. Revise the implementation from commit a7f41a7ee4 (Android: Fix find_* search order within NDK for unified toolchains, 2020-10-13). In the old implementation, if people set CMAKE_FIND_ROOT_PATH, CMAKE_ANDROID_NDK won't be added to find root. And all paths added to CMAKE_SYSTEM_*_PATH below will be rerooted to the user specified root. 2. Add api level specific library path to CMAKE_SYSTEM_PREFIX_PATH. As the discussion in [1], some people want the paths added by UnixPaths.cmake. They install their libraries according to GNUInstallDirs [2]. As a result, we cannot clear CMAKE_SYSTEM_PREFIX_PATH. It includes /usr so no matter what we specify in CMAKE_SYSTEM_LIBRARY_PATH, /usr/lib/<arch> will be searched first. The author also pointed out a way to solve this issue [3]. In addition to other paths, CMake also searches <root>/<prefix> [4]. So we can add the API specific lib path to the beginning of CMAKE_SYSTEM_PREFIX_PATH, to have it searched first. [1] https://android-review.googlesource.com/c/platform/ndk/+/1486800 [2] https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html [3] https://github.com/android/ndk/issues/1179#issuecomment-613435081 [4] https://gitlab.kitware.com/cmake/cmake/-/blob/11425041f04fd0945480b8f9e9933d1549b93981/Source/cmSearchPath.cxx#L202
| * | | | | | | | | | Merge topic 'python3.10'Brad King2020-11-102-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb2ebbf241 FindPython{Interp,Libs}: Add support for version 3.10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5482
| * | | | | | | | | | Merge topic 'FindProtobuf-multiple-extensions'Brad King2020-11-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2bb3c0a44b FindProtobuf: Support files with multiple extensions (#18329) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5476
| | * | | | | | | | | | FindProtobuf: Support files with multiple extensions (#18329)Florian Franzen2020-11-061-1/+1
| | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge topic 'TestBigEndian-use-abi-result'Brad King2020-11-091-8/+28
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fcc89bda1d TestBigEndian: Re-implement using byte order detected from ABI check 412ce907a2 Tests: Prepare RunCMake.ABI cases to run more checks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5477
| | * | | | | | | | | | TestBigEndian: Re-implement using byte order detected from ABI checkBrad King2020-11-061-8/+28
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the module as deprecated in favor of the ABI check results.
| * | | | | | | | | | Merge topic 'android-flags'Brad King2020-11-0910-56/+63
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 94d87afece Android: allow NDK to control cflags / ldflags 85e5139aba Android: Move *_LLVM_TRIPLE to the centralized table Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5461
| | * | | | | | | | | Android: allow NDK to control cflags / ldflagsHaibo Huang2020-11-061-7/+27
| | | | | | | | | | |
| | * | | | | | | | | Android: Move *_LLVM_TRIPLE to the centralized tableHaibo Huang2020-11-0610-49/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to skip `abi-*.cmake` in the next change. In the future we may move all this information to the NDK.
| * | | | | | | | | | Merge topic 'android-build-type'Brad King2020-11-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3dae826e43 Android: default to RelWithDebInfo Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5465
| | * | | | | | | | | | Android: default to RelWithDebInfoHaibo Huang2020-11-041-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge topic 'FindICU-naming'Brad King2020-11-061-8/+15
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 21cb588629 FindICU: Correct variable names to match documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5451
| | * | | | | | | | | | | FindICU: Correct variable names to match documentationRoger Leigh2020-10-311-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add "ICU_" suffix to all _FOUND variables * Ensure cache variables can also be used with correct ICU_ suffix and compatibility name * Improve ICU_DEBUG messages to verify compatibility and corrected variable names are set to the correct values
| * | | | | | | | | | | | Merge topic 'cpack-nuget'Brad King2020-11-062-5/+78
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 41ae7c4e51 CPack/NuGet: Add settings for the license, icon, and language Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5415
| | * | | | | | | | | | | | CPack/NuGet: Add settings for the license, icon, and languageBob Apthorpe2020-11-052-5/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also update the XML Schema. Fixes: #21348
| * | | | | | | | | | | | | Merge topic 'apple-v4-tbd-file-arch-lookup'Brad King2020-11-061-3/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c6797e03e Apple: Update SDK architecture detection for tbd file version 4 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5470
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge topic 'FindPostgreSQL-13'Brad King2020-11-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f3f09f1c96 FindPostgreSQL: support version 13 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5468
generated by cgit v0.12 at 2025-01-10 09:56:38 (GMT)