summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'avoid-qt5-deprecation-warnings'Brad King2020-06-152-9/+13
|\
| * QCMakeWidgets: replace QDirModelBen Boeckel2020-06-151-9/+9
| * QCMake: use loadRelaxed if availableBen Boeckel2020-06-151-0/+4
* | Merge topic 'bundle-exe-space-in-name'Brad King2020-06-154-7/+19
|\ \
| * | find_program: Properly decode URL for bundle exe name with spacesCraig Scott2020-06-144-7/+19
| |/
* | Merge topic 'cmake-build-retval'Brad King2020-06-155-2/+8
|\ \
| * | 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
* | | 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
| |\ \ \
* | \ \ \ Merge topic 'cuda_clang_toolkit_path'Brad King2020-06-158-260/+448
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | CUDA: Determine CUDA toolkit location for NVCCRaul Tambre2020-06-124-126/+134
| * | | | CUDA: Pass toolkit path to ClangRaul Tambre2020-06-125-235/+293
| * | | | FindCUDAToolkit: Avoid unnecessary temporary variable computing binary dirRaul Tambre2020-06-121-6/+4
| * | | | FindCUDAToolkit: Remove unnecessary checks around searchesRaul Tambre2020-06-122-21/+15
| * | | | FindCUDAToolkit: Use list(SORT) to sort in natural orderRaul Tambre2020-06-122-72/+8
| * | | | FindCUDAToolkit: Compute CUDAToolkit_INCLUDE_DIR instead of searchingRaul Tambre2020-06-122-8/+14
| * | | | FindCUDAToolkit: Add CUDAToolkit_LIBRARY_ROOTRaul Tambre2020-06-123-0/+31
| * | | | FindCUDAToolkit: Re-unify with Internal/CUDAToolkitRaul Tambre2020-06-123-233/+390
* | | | | 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
| |\ \ \ \
* | \ \ \ \ Merge topic 'cuda_architectures_disable'Brad King2020-06-157-25/+81
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | CUDA: Add support for disabling CUDA_ARCHITECTURESRaul Tambre2020-06-157-25/+81
| | |/ / / | |/| | |
* | | | | Merge branch 'release-3.18'Brad King2020-06-150-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'clang_cxx20' into release-3.18Brad King2020-06-151-1/+8
| |\ \ \ \
* | \ \ \ \ Merge topic 'clang_cxx20'Brad King2020-06-151-1/+8
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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
| | |/ / / | |/| | |
* | | | | Merge topic 'deprecate-policy-old'Brad King2020-06-154-1/+44
|\ \ \ \ \
| * | | | | Help/dev: Add maintainer guide step for initial post-release developmentBrad King2020-06-131-0/+25
| * | | | | Add deprecation warnings for policies CMP0072 and belowBrad King2020-06-123-1/+19
* | | | | | 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
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
* | | | | | Merge topic 'revert-find_program-exe-no-read'Brad King2020-06-153-5/+11
|\ \ \ \ \ \ | | |/ / / / | |/| | | / | |_|_|_|/ |/| | | |
| * | | | find_program: Revert "Find programs that are executable but not readable"Brad King2020-06-123-5/+11
* | | | | 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
| |\ \ \ \
* | \ \ \ \ Merge topic 'gitlab-ci-xcode-testing'Brad King2020-06-126-8/+45
|\ \ \ \ \ \ | | |/ / / / | |/| | / / | |_|_|/ / |/| | | |
| * | | | ci: don't test BundleGeneratorTestBen Boeckel2020-06-121-0/+3
| * | | | 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
| |/ / /
* | | | 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
| |\ \ \
* | \ \ \ Merge topic 'gitlab-ci-ext-test-sets'Brad King2020-06-1210-53/+149
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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
|\ \ \ \ \
| * | | | | QtDialog: remove Qt4 definitionBen Boeckel2020-06-091-3/+0