summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'avoid-qt5-deprecation-warnings'Brad King2020-06-152-9/+13
|\ | | | | | | | | | | | | | | 0fc1818831 QCMakeWidgets: replace QDirModel 736fb34294 QCMake: use loadRelaxed if available Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4894
| * QCMakeWidgets: replace QDirModelBen Boeckel2020-06-151-9/+9
| |
| * QCMake: use loadRelaxed if availableBen Boeckel2020-06-151-0/+4
| | | | | | | | Added in 5.14 and load() was deprecated at the same time.
* | Merge topic 'bundle-exe-space-in-name'Brad King2020-06-154-7/+19
|\ \ | | | | | | | | | | | | | | | | | | d3fd518c03 find_program: Properly decode URL for bundle exe name with spaces Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4891
| * | find_program: Properly decode URL for bundle exe name with spacesCraig Scott2020-06-144-7/+19
| |/ | | | | Fixes: #20817
* | Merge topic 'cmake-build-retval'Brad King2020-06-155-2/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | b9dd072e05 Tests: Add case for cmake --build with a failing target 87c860ebad cmake --build: Fix exit code when building multiple targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4878
| * | Tests: Add case for cmake --build with a failing targetBrad King2020-06-124-0/+5
| | |
| * | cmake --build: Fix exit code when building multiple targetslumberyard-employee-dm2020-06-121-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Updated the cmGlobalGenerator::Build method to check the return `retVal` parameter supplied to the `cmSystemTools::RunSingleCommand` to validate that each invocation of the build command returned an exit code of zero. Fixes: #20790
* | | Merge branch 'release-3.18'Brad King2020-06-150-0/+0
|\ \ \
| * \ \ Merge topic 'cuda_clang_toolkit_path' into release-3.18Brad King2020-06-158-260/+448
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec59fb6c31 CUDA: Determine CUDA toolkit location for NVCC 0a056246a1 CUDA: Pass toolkit path to Clang 9c43972127 FindCUDAToolkit: Avoid unnecessary temporary variable computing binary dir 9eebb5b8b2 FindCUDAToolkit: Remove unnecessary checks around searches 8f01fe7bf1 FindCUDAToolkit: Use list(SORT) to sort in natural order 8c144fe9ad FindCUDAToolkit: Compute CUDAToolkit_INCLUDE_DIR instead of searching 403f8d31e3 FindCUDAToolkit: Add CUDAToolkit_LIBRARY_ROOT 6636693134 FindCUDAToolkit: Re-unify with Internal/CUDAToolkit Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4828
* | \ \ \ Merge topic 'cuda_clang_toolkit_path'Brad King2020-06-158-260/+448
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec59fb6c31 CUDA: Determine CUDA toolkit location for NVCC 0a056246a1 CUDA: Pass toolkit path to Clang 9c43972127 FindCUDAToolkit: Avoid unnecessary temporary variable computing binary dir 9eebb5b8b2 FindCUDAToolkit: Remove unnecessary checks around searches 8f01fe7bf1 FindCUDAToolkit: Use list(SORT) to sort in natural order 8c144fe9ad FindCUDAToolkit: Compute CUDAToolkit_INCLUDE_DIR instead of searching 403f8d31e3 FindCUDAToolkit: Add CUDAToolkit_LIBRARY_ROOT 6636693134 FindCUDAToolkit: Re-unify with Internal/CUDAToolkit Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4828
| * | | | CUDA: Determine CUDA toolkit location for NVCCRaul Tambre2020-06-124-126/+134
| | | | | | | | | | | | | | | | | | | | | | | | | Similar to how we already do for Clang. Avoids a lot of redundant work in FindCUDAToolkit.
| * | | | CUDA: Pass toolkit path to ClangRaul Tambre2020-06-125-235/+293
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang isn't very good at finding the installed CUDA toolkit. The upstream recommendation is that we should pass the toolkit explicitly. Additionally: * Avoids Clang having to search for the toolkit on every invocation. * Allows the user to use a toolkit from a non-standard location by simply setting CUDAToolkit_ROOT. The same way as with FindCUDAToolkit. Clang wants the directory containing the device library and version.txt as the toolkit path. We thus pass the newly introduced CUDAToolkit_LIBRARY_ROOT as the toolkit path. We save CUDAToolkit_ROOT_DIR and CUDAToolkit_LIBRARY_ROOT on Clang to have them available in try_compile() and avoid unnecessary re-searching or a possibly different installation being found in FindCUDAToolkit. This however means that the selected toolkit can't be changed after the initial language enablement. We now determine CUDA compiler ID before doing actual detection, as we don't want to spend time finding the CUDA toolkit for NVIDIA. Implements #20754.
| * | | | FindCUDAToolkit: Avoid unnecessary temporary variable computing binary dirRaul Tambre2020-06-121-6/+4
| | | | |
| * | | | FindCUDAToolkit: Remove unnecessary checks around searchesRaul Tambre2020-06-122-21/+15
| | | | | | | | | | | | | | | | | | | | | | | | | find_*() don't search if the result variable is already set. Remove the if()s around such cases.
| * | | | FindCUDAToolkit: Use list(SORT) to sort in natural orderRaul Tambre2020-06-122-72/+8
| | | | | | | | | | | | | | | | | | | | | | | | | We had a custom loop to sort in the natural order. Since CMake 3.18 this is supported natively by CMake and simplifies the code significantly.
| * | | | FindCUDAToolkit: Compute CUDAToolkit_INCLUDE_DIR instead of searchingRaul Tambre2020-06-122-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can avoid searching for this since CUDAToolkit_TARGET_DIR always contains the include/ directory. But add a warning just in case. Also apply this in CMakeDetermineCUDACompiler for Clang code.
| * | | | FindCUDAToolkit: Add CUDAToolkit_LIBRARY_ROOTRaul Tambre2020-06-123-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On scattered installations version.txt and nvvm are located at this location. This may be useful to users and will allow us in the future to parse version.txt instead of invoking nvcc to figure out the CUDA toolkit version. We also add it to CMakeDetermineCUDACompiler in preparation for future use by Clang code.
| * | | | FindCUDAToolkit: Re-unify with Internal/CUDAToolkitRaul Tambre2020-06-123-233/+390
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A portion of FindCUDAToolkit was previously split in commit dc2eae1f (FindCUDAToolkit: Factor out discovery code into a separate file, 2020-04-22) out into Internal/CUDAToolkit to allow re-use of the code in CMakeDetermineCUDACompiler for Clang support. This has turned out to be a bad solution due to Clang requiring quite a bit of special handling and special handling for NVCC leaking out from Internal/CUDAToolkit into the Clang code using it. Thus it seems better to re-unify this code and duplicate the parts of the code necessary for Clang where it's required. This will help us get logic correct for both NVCC and CUDA handling. We can still unify the common parts in the future once the code has matured.
* | | | | Merge branch 'release-3.18'Brad King2020-06-150-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'cuda_architectures_disable' into release-3.18Brad King2020-06-157-25/+81
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 877a92e968 CUDA: Add support for disabling CUDA_ARCHITECTURES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4886
* | \ \ \ \ Merge topic 'cuda_architectures_disable'Brad King2020-06-157-25/+81
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 877a92e968 CUDA: Add support for disabling CUDA_ARCHITECTURES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4886
| * | | | | CUDA: Add support for disabling CUDA_ARCHITECTURESRaul Tambre2020-06-157-25/+81
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ability to disable adding architectures completely for packaging purposes and cases requiring passing the architectures flags explicitly has been requested. Support a false value for CUDA_ARCHITECTURES and CMAKE_CUDA_ARCHITECTURES for this purpose. Implements #20821.
* | | | | Merge branch 'release-3.18'Brad King2020-06-150-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'clang_cxx20' into release-3.18Brad King2020-06-151-1/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b365385d66 Clang: Record Clang 6.0+ as fully supporting C++17 5d26efe38f Clang: Add final C++20 flag for Clang 11.0+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4887
* | \ \ \ \ Merge topic 'clang_cxx20'Brad King2020-06-151-1/+8
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b365385d66 Clang: Record Clang 6.0+ as fully supporting C++17 5d26efe38f Clang: Add final C++20 flag for Clang 11.0+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4887
| * | | | | Clang: Record Clang 6.0+ as fully supporting C++17Raul Tambre2020-06-131-0/+4
| | | | | |
| * | | | | Clang: Add final C++20 flag for Clang 11.0+Raul Tambre2020-06-131-1/+4
| | |/ / / | |/| | | | | | | | | | | | | | | | | | -std=c++20 superseded -std=c++2a in upstream Clang commit 24ad121582454e625bdad125c90d9ac0dae948c8.
* | | | | Merge topic 'deprecate-policy-old'Brad King2020-06-154-1/+44
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9710790a39 Help/dev: Add maintainer guide step for initial post-release development 6f6651f728 Add deprecation warnings for policies CMP0072 and below Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4884
| * | | | | Help/dev: Add maintainer guide step for initial post-release developmentBrad King2020-06-131-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document steps for deprecating old policy settings and future-proofing export files generated by `install(EXPORT)`.
| * | | | | Add deprecation warnings for policies CMP0072 and belowBrad King2020-06-123-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OLD behaviors of all policies are deprecated, but only by documentation. Add an explicit deprecation diagnostic for policies introduced in CMake 3.11 and below to encourage projects to port away from setting policies to OLD.
* | | | | | Merge branch 'release-3.18'Brad King2020-06-150-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge topic 'revert-find_program-exe-no-read' into release-3.18Brad King2020-06-153-5/+11
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | cc02ced530 find_program: Revert "Find programs that are executable but not readable" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4871
* | | | | | Merge topic 'revert-find_program-exe-no-read'Brad King2020-06-153-5/+11
|\ \ \ \ \ \ | | |/ / / / | |/| | | / | |_|_|_|/ |/| | | | | | | | | | | | | | cc02ced530 find_program: Revert "Find programs that are executable but not readable" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4871
| * | | | find_program: Revert "Find programs that are executable but not readable"Brad King2020-06-123-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit 86e6349ef7 (find_program: Find programs that are executable but not readable, 2020-04-04, v3.18.0-rc1~372^2) can break existing projects that were (likely accidentally) relying on the old behavior to find files that are readable but not executable. Revert the fix for now. We can re-introduce it with a policy later. Instead of reverting the test case, update it to cover the old behavior. That can serve as a reference for testing the policy when introduced. Fixes: #20814 Issue: #10468
* | | | | Merge branch 'release-3.18'Brad King2020-06-120-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'gitlab-ci-xcode-testing' into release-3.18Brad King2020-06-126-8/+45
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f4777ab81 ci: don't test BundleGeneratorTest 77b44ed4ba gitlab-ci: add an Xcode tester d33b38d4aa gitlab-ci: rename some scripts to be Linux-specific Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4883
* | \ \ \ \ Merge topic 'gitlab-ci-xcode-testing'Brad King2020-06-126-8/+45
|\ \ \ \ \ \ | | |/ / / / | |/| | / / | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | 0f4777ab81 ci: don't test BundleGeneratorTest 77b44ed4ba gitlab-ci: add an Xcode tester d33b38d4aa gitlab-ci: rename some scripts to be Linux-specific Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4883
| * | | | ci: don't test BundleGeneratorTestBen Boeckel2020-06-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | This test uses shared global resources and doesn't work well with the CI infrastructure we have. It is tested by nightly builders however.
| * | | | gitlab-ci: add an Xcode testerBen Boeckel2020-06-125-2/+37
| | | | |
| * | | | gitlab-ci: rename some scripts to be Linux-specificBen Boeckel2020-06-121-7/+6
| |/ / / | | | | | | | | | | | | macOS install trees have a different layout and package names.
* | | | Merge branch 'release-3.18'Brad King2020-06-120-0/+0
|\ \ \ \ | |/ / /
| * | | Merge topic 'gitlab-ci-ext-test-sets' into release-3.18Brad King2020-06-1210-53/+149
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2e7cefec03 gitlab-ci: add a cuda10.2 builder 1a2961b895 Tests: add CUDA labels to tests which are affected by CUDA 2caa7502d5 ci: support running just a set of tests with external builders 26b4cbcf93 gitlab-ci: move Makefiles Linux tests to use the package Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4877
* | \ \ \ Merge topic 'gitlab-ci-ext-test-sets'Brad King2020-06-1210-53/+149
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2e7cefec03 gitlab-ci: add a cuda10.2 builder 1a2961b895 Tests: add CUDA labels to tests which are affected by CUDA 2caa7502d5 ci: support running just a set of tests with external builders 26b4cbcf93 gitlab-ci: move Makefiles Linux tests to use the package Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4877
| * | | | gitlab-ci: add a cuda10.2 builderBen Boeckel2020-06-124-0/+52
| | | | |
| * | | | Tests: add CUDA labels to tests which are affected by CUDABen Boeckel2020-06-114-33/+61
| | | | |
| * | | | ci: support running just a set of tests with external buildersBen Boeckel2020-06-111-0/+7
| | | | |
| * | | | gitlab-ci: move Makefiles Linux tests to use the packageBen Boeckel2020-06-112-20/+29
| | | | |
* | | | | Merge topic 'cmake-gui-qt5-only'Brad King2020-06-126-145/+85
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4037beb747 QtDialog: remove Qt4 definition ce9dbceb42 QtDialog: remove Qt4-only code 8ea50749da QtDialog: use Qt5's imported targets 4ccc9921be QtDialog: use qt5 functions for special Qt sources e4d6015460 QtDialog: remove Qt4 support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4836
| * | | | | QtDialog: remove Qt4 definitionBen Boeckel2020-06-091-3/+0
| | | | | |
generated by cgit v0.12 at 2025-08-26 15:43:11 (GMT)