summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* find_*(): Add CMAKE_IGNORE_PREFIX_PATH variableKyle Edwards2022-02-0216-12/+165
| | | | Fixes: #20878
* Refactor: Keep track of prefixes in cmSearchPathKyle Edwards2022-02-024-27/+54
|
* Merge topic 'cuda_generic_arch_all'Brad King2022-02-027-124/+214
|\ | | | | | | | | | | | | | | 8f64df0a7c CUDA: Generic all and all-major support Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex <leha-bot@yandex.ru> Merge-request: !6816
| * CUDA: Generic all and all-major supportRaul Tambre2022-02-017-124/+214
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 14d8a276 (CUDA: Support nvcc 11.5 new -arch=all|all-major flags, 2021-08-17) added all and all-major options to CUDA_ARCHITECTURES. These are fairly generic and likely to see real-world use by distributors. Thus it's desirable to support these also for Clang and older NVCC versions. The supported architectures are dependent on the toolkit version. We determine the toolkit version prior to compiler detection. For NVCC we get the version from the vendor identification output, but for Clang we need to invoke NVCC separately. The architecture information is mostly based on the Wikipedia list with the earliest supported version being CUDA 7.0. This could be documented and expanded in the future to allow projects to query CUDA toolkit version and architecture information. For Clang we additionally constrain based on its support. Additionally the architecture mismatch detection logic is fixed, improved and updated for generic support: * Commit 01428c55 (CUDA: Fail fast if CMAKE_CUDA_ARCHITECTURES doesn't work during detection, 2020-08-29) enabled CMAKE_CUDA_COMPILER_ID_REQUIRE_SUCCESS if CMAKE_CUDA_ARCHITECTURES is specified. This results in CMakeDetermineCompilerID.cmake printing the compiler error and our code for presenting the mismatch in a user-friendly way being useless. The custom logic seems preferable so go back to not enabling it. * Commit 14d8a276 (CUDA: Support nvcc 11.5 new -arch=all|all-major flags, 2021-08-17) tried to support CMP0054 but forgot to add x to the interpolated result. Thus the conditions would always evaluate to false. This is fixed as a byproduct of removing NVIDIA specific checks, improving the error message and replacing architectures_mode with a simpler architectures_explicit. Visual Studio support omits testing the flags during detection due to complexities in determining the toolkit version when using it. A long-term proper implementation would be #23161. Implements #22860.
* | Merge topic 'dotnet_ref_in_sdk'Brad King2022-02-022-1/+5
|\ \ | | | | | | | | | | | | | | | | | | 5ee3154f65 VS: .Net SDK Style projects can add Reference to dlls Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6932
| * | VS: .Net SDK Style projects can add Reference to dllsSumit Bhardwaj2022-02-012-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | When support for `DOTNET_SDK` was added, only a minimal set of options were built in. Based on user feedback, support for reference to dlls (not just projects) is needed. That support is added here. Fixes: #23166
* | | Merge topic 'update-expat'Brad King2022-02-024-15/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 338240fd21 Merge branch 'upstream-expat' into update-expat 8e0070b905 expat 2022-01-30 (81b89678) f06a4c2406 expat: Update script to get Expat 2.4.4 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6933
| * \ \ Merge branch 'upstream-expat' into update-expatBrad King2022-02-013-14/+26
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # By Expat Upstream * upstream-expat: expat 2022-01-30 (81b89678)
| | * | | expat 2022-01-30 (81b89678)Expat Upstream2022-02-013-14/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libexpat/libexpat.git at commit 81b89678e200820271b72cacdd45fb5868855765 (R_2_4_4).
| * | | | expat: Update script to get Expat 2.4.4Brad King2022-02-011-1/+1
| | | | |
* | | | | Merge topic 'ep-redownload-on-SOURCE_DIR-change'Brad King2022-02-026-68/+108
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d3477eba06 ExternalProject: Rerun download on SOURCE_DIR change Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6926
| * | | | | ExternalProject: Rerun download on SOURCE_DIR changeCraig Scott2022-02-016-68/+108
| | | | | | | | | | | | | | | | | | Fixes: #21748
* | | | | | Merge topic 'ci-fedora35'Brad King2022-02-0226-70/+79
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c76abba044 gitlab-ci: update to Fedora 35 base images 0ab6e5ca5b gitlab-ci: update to Fedora 35 for upload jobs 1729e1292d ci: update to Fedora 35 for Linux base images 89700cba9a clang-tidy: ignore warnings new in version 13 efe3af0119 Tests: Update FindBoost.TestPython for Python 3.10 a541c8f510 Utilities/Sphinx: Ignore warning in generated texinfo documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6935
| * | | | | | gitlab-ci: update to Fedora 35 base imagesBrad King2022-02-0117-63/+63
| | | | | | |
| * | | | | | gitlab-ci: update to Fedora 35 for upload jobsBrad King2022-02-011-2/+2
| | | | | | |
| * | | | | | ci: update to Fedora 35 for Linux base imagesBrad King2022-02-014-3/+3
| | | | | | |
| * | | | | | clang-tidy: ignore warnings new in version 13Brad King2022-02-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These warnings can be fixed in the future. Ignore them for now.
| * | | | | | Tests: Update FindBoost.TestPython for Python 3.10Brad King2022-02-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up commit d4bb6c0c7f (FindBoost: Add support for Python 3.10, 2021-12-16, v3.22.2~14^2) with an update for the FindBoost test.
| * | | | | | Utilities/Sphinx: Ignore warning in generated texinfo documentationBrad King2022-02-012-0/+4
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2022-02-021-1/+1
|/ / / / / /
* | | | | | Merge branch 'release-3.22'Brad King2022-02-010-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'release-3.21' into release-3.22Brad King2022-02-011-0/+7
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'release-3.21'Brad King2022-02-011-0/+7
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | CMake 3.21.5v3.21.5Brad King2022-02-012-1/+8
| | | | | | | |
* | | | | | | | Merge topic 'refactor-find-package-cmake-ignore-path'Brad King2022-02-016-11/+41
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 11f97d1968 find_package(): Refactor CMAKE_[SYSTEM_]IGNORE_PATH 30e5c1d92b find_package(): Add tests for CMAKE_IGNORE_PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6918
| * | | | | | | find_package(): Refactor CMAKE_[SYSTEM_]IGNORE_PATHKyle Edwards2022-01-314-11/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the old implementation, CMAKE_[SYSTEM_]IGNORE_PATH was handled in cmFindCommon. Move it into cmFindPackageCommand.
| * | | | | | | find_package(): Add tests for CMAKE_IGNORE_PATHKyle Edwards2022-01-312-0/+13
| | | | | | | |
* | | | | | | | Merge topic 'update-kwsys'Brad King2022-02-011-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e242a95d0 Merge branch 'upstream-KWSys' into update-kwsys 7d9204a7e2 KWSys 2022-01-31 (9fd1660a) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6930
| * \ \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2022-01-311-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2022-01-31 (9fd1660a)
| | * | | | | | | KWSys 2022-01-31 (9fd1660a)KWSys Upstream2022-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 9fd1660a9ddeaf9cb590bfd801c94a7a374ae94b (master). Upstream Shortlog ----------------- Aaron Liu (1): dc6b6641 testSystemTools: apply root-check on AIX
* | | | | | | | | Merge topic 'FindHDF5-imported-per-config'Brad King2022-02-011-4/+42
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db9d911db0 FindHDF5: Set config-specific locations for imported targets d28e5263fe FindHDF5: Drop IMPORTED_IMPLIB property from imported UNKNOWN libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6931
| * | | | | | | | | FindHDF5: Set config-specific locations for imported targetsBrad King2022-01-311-2/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the imported target locations added by commit a8e0a6b3e4 (FindHDF5: Port changes from VTK, 2020-06-10, v3.19.0-rc1~312^2~1) to use config-specific locations. Issue: #21637
| * | | | | | | | | FindHDF5: Drop IMPORTED_IMPLIB property from imported UNKNOWN librariesBrad King2022-01-311-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The imported targets added by commit a8e0a6b3e4 (FindHDF5: Port changes from VTK, 2020-06-10, v3.19.0-rc1~312^2~1) to use config-specific locations set the `IMPORTED_IMPLIB` target property. That property has no meaning for an imported library with type `UNKNOWN`. Drop it to avoid confusion.
* | | | | | | | | | Merge topic 'feature/findruby-3x'Brad King2022-02-011-7/+28
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b6bc7791d FindRuby: evict non-matching binaries and keep scanning. 42d99a248e FindRuby: add support for versions up to 3.1. Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6925
| * | | | | | | | | | FindRuby: evict non-matching binaries and keep scanning.Mihai Moldovan2022-01-311-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The possible executable names list always starts with a plain "ruby" binary, which is scanned for first. If that does exist (which satisfies find_program), but doesn't match the requested version, the executable will be dismissed by _RUBY_VALIDATE_INTERPRETER (which is sane), but searching also stops. Fix that by keeping the search going, removing items from the list as we go, until find_program returns a path that _RUBY_VALIDATE_INTERPRETER is happy with or the list is empty.
| * | | | | | | | | | FindRuby: add support for versions up to 3.1.Mihai Moldovan2022-01-311-6/+16
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge topic 'cpack_nsis_no_description'Brad King2022-02-011-2/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b56e0f4689 CPack/NSIS: Fix description not displayed for components Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6920
| * | | | | | | | | | CPack/NSIS: Fix description not displayed for componentsJohnny Jazeix2022-01-291-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #23151
* | | | | | | | | | | Merge branch 'release-3.22'Brad King2022-02-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'ci-assertions' into release-3.22Brad King2022-02-012-0/+5
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !6927
* | \ \ \ \ \ \ \ \ \ \ Merge topic 'ci-assertions'Brad King2022-02-012-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 45feab3c00 gitlab-ci: enable assertions on fedora34-ninja jobs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6927
| * | | | | | | | | | | gitlab-ci: enable assertions on fedora34-ninja jobsBrad King2022-01-312-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should have at least one CI job in merge request pipelines that builds CMake with assertions enabled. We avoid using the `Debug` configuration in order to keep CI artifacts small, so instead use the `Release` configuration without `-DNDEBUG`.
* | | | | | | | | | | | Merge branch 'release-3.22'Brad King2022-02-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'release-3.21' into release-3.22Brad King2022-02-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge branch 'release-3.21'Brad King2022-02-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'release-3.20' into release-3.21Brad King2022-01-310-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'help-try-compile-result-var' into release-3.21Brad King2022-01-312-13/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !6923
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release-3.20'Brad King2022-02-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'help-try-compile-result-var' into release-3.20Brad King2022-01-312-13/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !6923
* | | | | | | | | | | | | | Merge branch 'release-3.22'Brad King2022-02-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
generated by cgit v0.12 at 2025-02-05 04:55:29 (GMT)