summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindJNI-arm64'Brad King2020-08-261-0/+2
|\ | | | | | | | | | | | | 44dffbcc94 FindJNI: Add arm64 support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5162
| * FindJNI: Add arm64 supportMalcolm Parsons2020-08-251-0/+2
| | | | | | | | On 64-bit ARM, JVM directories have an arm64 suffix.
* | Merge topic 'cuda-std-for-msvc'Brad King2020-08-261-4/+6
|\ \ | | | | | | | | | | | | | | | | | | bed315a0da CUDA: Support setting CUDA14/17 when using MSVC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5160
| * | CUDA: Support setting CUDA14/17 when using MSVCRobert Maynard2020-08-241-4/+6
| |/ | | | | | | Fixes #20953
* | Merge topic 'msvc_static_assert'Brad King2020-08-252-3/+5
|\ \ | | | | | | | | | | | | | | | | | | 95bc11dbb4 MSVC: Record support for c_static_assert Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5148
| * | MSVC: Record support for c_static_assertRaul Tambre2020-08-202-3/+5
| |/ | | | | | | Supported since MSVC 19.28.29115 (VS 16.8.0 Preview 1.0).
| * Merge topic 'FindMPI-cuda-pthread' into release-3.18Brad King2020-08-201-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | 47abe5f225 FindMPI: Fix regression in pthread guard Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Raul Tambre <raul@tambre.ee> Merge-request: !5147
| * \ Merge topic 'ep-patch-skip-update-dep' into release-3.18Brad King2020-08-191-27/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 715324742f ExternalProject: Stop configure target from always appearing out-of-date c0b7198ad9 ExternalProject: Stop patch target from always appearing out-of-date Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5136
| * \ \ Merge topic 'llvm-rc-quote-cmake' into release-3.18Brad King2020-08-191-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3937536d16 llvm-rc: Fix quoting of path to cmake in CMAKE_RC_COMPILE_OBJECT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5139
| * \ \ \ Merge topic 'FindPython-enhance-version-extraction-from-lib-name' into ↵Brad King2020-08-191-3/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release-3.18 72822e26c9 FindPython: enhance robustness of version extraction from library name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5135
* | | | | | FetchContent: Fix SOURCE_DIR, BUILD_DIR when disconnected or overriddenCraig Scott2020-08-231-10/+31
| | | | | | | | | | | | | | | | | | Fixes: #21123
* | | | | | Merge topic 'clang-cl-restore-preprocess'Brad King2020-08-211-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b083d59c2 clang-cl: Restore rules to create preprocessed and assembly output Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5142
| * | | | | | clang-cl: Restore rules to create preprocessed and assembly outputBrad King2020-08-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit d993ebd4ca (clang-cl: Add '--' before source file, 2020-07-28) we accidentally replaced these rules with those to compile an object file.
* | | | | | | Merge topic 'FindMPI-cuda-pthread'Brad King2020-08-201-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 47abe5f225 FindMPI: Fix regression in pthread guard Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Raul Tambre <raul@tambre.ee> Merge-request: !5147
| * | | | | | FindMPI: Fix regression in pthread guardAxel Huebl2020-08-201-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a regression with MPI and CUDA<10.2 that did let `-pthread` flags slip to nvcc again. In commit b725a19072 (FindMPI: Deny -fexceptions from NVCC, 2020-07-02, v3.18.0-rc4~12^2) we accidentally forgot to use the variable containing the replacement result. Fixes: #21108
* | | | | | Merge topic 'CMakeDetermineCXXCompiler-clang-typo'Brad King2020-08-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10d7445dd8 clang: Fix the typo for CMAKE_CXX_COMPILER_ID_TEST_FLAGS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5140
| * | | | | | clang: Fix the typo for CMAKE_CXX_COMPILER_ID_TEST_FLAGSThomas Bernard2020-08-181-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo from commit 270e0d9c4d (Detect the correct target architecture for clang compilers., 2020-07-28). Issue: #21097
* | | | | | Merge topic 'cpack-wix-custom-xmlns'Brad King2020-08-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 267de3ba30 CPack/WiX: Add support for custom XML namespaces Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5132
| * | | | | | CPack/WiX: Add support for custom XML namespacesFritz Elfert2020-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `CPACK_WIX_CUSTOM_XMLNS` option to specify these. Fixes: #21098
* | | | | | | Merge topic 'ExternalProject-retry-only-recoverable'Brad King2020-08-192-34/+57
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 116b06870d ExternalProject: add INACTIVITY_TIMEOUT argument f24e34975a ExternalProject: retry download on recoverable errors Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5034
| * | | | | | | ExternalProject: add INACTIVITY_TIMEOUT argumentThomas Bernard2020-08-182-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to abort transfers on slow connections the ExternalProject command support passing the INACTIVITY_TIMEOUT argument. Fixes: #20992
| * | | | | | | ExternalProject: retry download on recoverable errorsThomas Bernard2020-08-111-31/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to shorten the download failure of ExternalProject download steps, a download retry is only done when a recoverable network error is encountered.
* | | | | | | | Merge topic 'CMakeDependentOption-doc'Brad King2020-08-191-10/+23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 91f791b498 CMakeDependentOption: Expand documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5138
| * | | | | | | | CMakeDependentOption: Expand documentationBetsy McPhail2020-08-181-10/+23
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge topic 'ep-patch-skip-update-dep'Brad King2020-08-191-27/+5
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 715324742f ExternalProject: Stop configure target from always appearing out-of-date c0b7198ad9 ExternalProject: Stop patch target from always appearing out-of-date Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5136
| * | | | | | | ExternalProject: Stop configure target from always appearing out-of-dateCraig Scott2020-08-181-24/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When updates are disconnected, don't depend on skip-update because that target is always considered out of date. Depend directly on the patch target instead because it already depends on the appropriate target regardless of whether updates are disconnected or not. This in turn means nothing depends on the skip-update target, so it has also been removed. Relates: #21086
| * | | | | | | ExternalProject: Stop patch target from always appearing out-of-dateCraig Scott2020-08-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The skip-update target is always considered out-of-date. The change in 7249ba9677 (ExternalProject: Enforce that patch depends on update, 2020-04-03) made the patch target depend on skip-update, which in turn made it always out of date too. The patch command should only be re-run if the download needs to be performed again where updates are disconnected. Fixes: #21086
* | | | | | | | Merge topic 'llvm-rc-quote-cmake'Brad King2020-08-191-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 447dfddb20 Merge branch 'backport-3.18-llvm-rc-quote-cmake' into llvm-rc-quote-cmake 3937536d16 llvm-rc: Fix quoting of path to cmake in CMAKE_RC_COMPILE_OBJECT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5139
| * \ \ \ \ \ \ \ Merge branch 'backport-3.18-llvm-rc-quote-cmake' into llvm-rc-quote-cmakeBrad King2020-08-181-1/+1
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | llvm-rc: Fix quoting of path to cmake in CMAKE_RC_COMPILE_OBJECTThomas Bernard2020-08-181-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the installation path to cmake includes spaces, the `<CMAKE_COMMAND>` is required to have proper quotation of the cmake call. Fixes: #21095
* | | | | | | Merge topic 'FindPython-enhance-version-extraction-from-lib-name'Brad King2020-08-191-3/+4
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72822e26c9 FindPython: enhance robustness of version extraction from library name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5135
| * | | | | | FindPython: enhance robustness of version extraction from library nameMarc Chevrier2020-08-181-3/+4
| | |/ / / / | |/| | | | | | | | | | | | | | | | Fixes: #21105
* | | | | | Merge topic 'CMakeFindBinUtils-fallback'Brad King2020-08-191-0/+13
|\ \ \ \ \ \ | |_|/ / / / |/| | | | / | | |_|_|/ | |/| | | | | | | | | | | | | 6896e50967 CMakeFindBinUtils: Always consider plain binutils when not cross-compiling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5137
| * | | | CMakeFindBinUtils: Always consider plain binutils when not cross-compilingRobert Maynard2020-08-181-0/+13
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit c5dd2ca538 (DetermineCompiler: Relax _CMAKE_TOOLCHAIN_PREFIX detection, 2020-03-25, v3.18.0-rc1~430^2), `_CMAKE_TOOLCHAIN_PREFIX` may be set even when not cross-compiling. In this case we may still need to use binutils without any prefix. Fixes: #21103
* | | | Merge topic 'findhdf5-targets'Brad King2020-08-181-2/+149
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5eff274017 FindHDF5: Remove VTK library type detection a8e0a6b3e4 FindHDF5: Port changes from VTK Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5129
| * | | | FindHDF5: Remove VTK library type detectionSeth R Johnson2020-08-141-5/+2
| | | | |
| * | | | FindHDF5: Port changes from VTKBen Boeckel2020-08-141-2/+152
| | |_|/ | |/| |
* | | | Merge topic 'FindX11-xcb-util-xfixes'Brad King2020-08-171-0/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d231b494f FindX11: Add xcb_util and xcb_xfixes libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5116
| * | | | FindX11: Add xcb_util and xcb_xfixes librariesTim Blechmann2020-08-121-0/+28
| | | | |
* | | | | Merge topic 'ios-combined-prune-archs'Brad King2020-08-171-1/+13
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5852b8867f CMakeIOSInstallCombined: Enforce disjoint architecture sets 79098d23eb Tests: Avoid warnings about unused arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5111
| * | | | CMakeIOSInstallCombined: Enforce disjoint architecture setsGregor Jasny2020-08-081-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with Xcode 12 the arm64 architecture is supported as an iOS device as well as simulator architecture. But the fat macho file format does not distinguish by SDK, only by architecture. That makes lipo (rightfully) complain that it cannot add both architectures to a single file. To work around we make sure that both SDKs are built for a disjoint set of architectures. If an architecture is present for both SDKs we prefer the currently configured one. The log output has been extended to reflect that: ``` [iOS combined] Architectures (iphoneos): arm64 arm64e armv7 armv7s [iOS combined] Architectures (iphonesimulator): arm64 arm64e i386 x86_64 [iOS combined] Architectures (iphonesimulator) after pruning: i386 x86_64 ```
* | | | | Merge topic 'FindOpenSSL-static'Kyle Edwards2020-08-141-0/+50
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1925f9d8eb FindOpenSSL: Add support for finding static libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5124
| * | | | | FindOpenSSL: Add support for finding static librariesSylvain Corlay2020-08-131-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20903
* | | | | | Merge topic 'FindRuby_document_deprecated_variables'Brad King2020-08-121-2/+13
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | e7fe0b24c4 FindRuby: Add documentation for deprecated variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5120
| * | | | | FindRuby: Add documentation for deprecated variablesDaniele E. Domenichelli2020-08-121-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit e672db628b (FindRuby: Rename variables to match case of module name, 2020-03-11, v3.18.0-rc1~546^2), the upper-case-prefixed variable names are for compatibility only but still exist. Put them back in the documentation. Issue: #21064
| * | | | | Merge topic 'msvc_c11' into release-3.18Brad King2020-08-122-12/+33
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7347f28c7 MSVC: Record support for C11 and c_restrict Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5115
| * \ \ \ \ \ Merge topic 'FindPython-manage-SOABI-in-all-versions' into release-3.18Brad King2020-08-121-12/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 951640f1f9 FindPython: manage SOABI for all Python versions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5119
* | \ \ \ \ \ \ Merge topic 'msvc_c11'Brad King2020-08-122-12/+33
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7347f28c7 MSVC: Record support for C11 and c_restrict Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5115
| * | | | | | | MSVC: Record support for C11 and c_restrictRaul Tambre2020-08-112-12/+33
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSVC >=19.27 supports a C11 switch. The `c_restrict` feature has also been implemented. Fixes: #21069
| * | | | | | Merge topic 'findhdf5-fix-nohl' into release-3.18Brad King2020-08-111-1/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e038107ee7 FindHDF5: fix compiler detection when HL is disabled Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5112
generated by cgit v0.12 at 2025-02-01 04:03:53 (GMT)