summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'FindOpenMP-IntelLLVM-Windows' into release-3.20Brad King2021-03-171-1/+6
|\
| * FindOpenMP: Use -Qiopenmp instead of -fiopenmp for IntelLLVM on WindowsWilliam R. Dieter2021-03-151-1/+6
* | Merge topic 'FindMatlab-r2021a' into release-3.20Brad King2021-03-161-0/+1
|\ \ | |/ |/|
| * FindMatlab: R2021a version mapMichael Hirsch2021-03-151-0/+1
* | Merge topic 'ci-vs-16.8-in-16.9' into release-3.20Brad King2021-03-152-4/+4
|\ \
| * | gitlab-ci: Fix using VS 16.8 toolset under VS 16.9Brad King2021-03-152-4/+4
|/ /
* | Merge branch 'release-3.19' into release-3.20Brad King2021-03-150-0/+0
|\ \
| * | CMake 3.19.7v3.19.7Brad King2021-03-151-1/+1
* | | Merge branch 'release-3.19' into release-3.20Brad King2021-03-150-0/+0
|\ \ \ | |/ /
| * | Merge branch 'vs-toolset-version' into release-3.19Brad King2021-03-127-96/+170
| |\ \
* | \ \ Merge topic 'vs-toolset-version' into release-3.20Brad King2021-03-157-96/+170
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | VS: Accept and translate '-T version=' values with three componentsBrad King2021-03-123-0/+57
| * | VS: Fix '-T version=14.28' under VS 16.9Brad King2021-03-126-91/+108
| * | cmGlobalVisualStudioVersionedGenerator: Clarify local variable nameBrad King2021-03-121-5/+5
| |/
* | Merge topic 'ci-build-no-doc' into release-3.20Brad King2021-03-121-1/+2
|\ \
| * | gitlab-ci: remove redundant sphinx build from release-style CI jobsBrad King2021-03-121-1/+2
|/ /
* | CMake 3.20.0-rc4v3.20.0-rc4Brad King2021-03-111-1/+1
* | Merge branch 'release-3.19' into release-3.20Brad King2021-03-110-0/+0
|\ \ | |/
| * Merge branch 'cray-compiler-wrapper-detection' into release-3.19Brad King2021-03-103-5/+5
| |\
| * \ Merge branch 'backport-xcode-framework-quoting' into release-3.19Brad King2021-03-104-1/+26
| |\ \
* | \ \ Merge topic 'xcode-framework-quoting' into release-3.20Brad King2021-03-114-1/+26
|\ \ \ \ | | |/ / | |/| |
| * | | Xcode: Restore support for spaces in framework namesBrad King2021-03-104-1/+26
| |/ /
* | | Merge topic 'cray-compiler-wrapper-detection' into release-3.20Brad King2021-03-113-5/+5
|\ \ \ | | |/ | |/|
| * | Cray: Enable Cray compiler wrapper detection on all platformsJustin LaPolla2021-03-103-5/+5
| |/
* | Merge topic 'ep-fc-revert-refactoring' into release-3.20Brad King2021-03-1035-1911/+1112
|\ \
| * | Revert ExternalProject and FetchContent refactoringCraig Scott2021-03-0935-1911/+1112
* | | Merge topic 'FindMatlab-MCR-vars' into release-3.20Brad King2021-03-101-2/+9
|\ \ \ | |/ / |/| |
| * | FindMatlab: Fix Matlab_LIBRARIES for MCRSilvio Traversaro2021-03-091-2/+9
|/ /
* | Merge branch 'release-3.19' into release-3.20Brad King2021-03-090-0/+0
|\ \ | |/
| * Merge branch 'CrayPrgEnv-detection' into release-3.19Brad King2021-03-083-5/+5
| |\
* | \ Merge topic 'CrayPrgEnv-detection' into release-3.20Brad King2021-03-093-5/+5
|\ \ \ | | |/ | |/|
| * | Revert "Cray: Fix Cray compiler detection on new platforms"Brad King2021-03-083-5/+5
| |/
* | Merge topic 'cray-fortran' into release-3.20Brad King2021-03-081-0/+4
|\ \
| * | Cray: Enable explicit Fortran preprocessing for Ninja generatorBrad King2021-03-051-0/+4
* | | Merge topic 'cmake-gui-search-case' into release-3.20Brad King2021-03-052-4/+4
|\ \ \ | |/ / |/| |
| * | cmake-gui: Restore search bar case insensitivityBrad King2021-03-042-4/+4
|/ /
* | CMake 3.20.0-rc3v3.20.0-rc3Brad King2021-03-031-1/+1
* | Merge topic 'android-r22' into release-3.20Brad King2021-03-037-3/+69
|\ \
| * | Android: Do not use gold for ndk >= r22Haibo Huang2021-03-031-1/+1
| * | Tests: Update RunCMake.Android for NDK r22Brad King2021-03-031-2/+13
| * | Help: Document CMAKE_ANDROID_NDK_VERSION variableBrad King2021-03-034-0/+16
| * | Android: Detect NDK version numberHaibo Huang2021-03-031-0/+39
* | | Merge topic 'ci-nightly-ide-jobs' into release-3.20Brad King2021-03-034-0/+9
|\ \ \
| * | | gitlab-ci: ignore failing tests for external IDE testingBen Boeckel2021-03-012-0/+3
| * | | gitlab-ci: allow some jobs to ignore failing tests on nightly runsBen Boeckel2021-03-011-0/+2
| * | | gitlab-ci: always upload test and release artifactsBen Boeckel2021-03-011-0/+4
* | | | Merge topic 'compilerid_require_success' into release-3.20Brad King2021-03-031-1/+1
|\ \ \ \
| * | | | CMakeDetermineCompilerId: Fix REQUIRE_SUCCESS with multiple user flagsRaul Tambre2021-03-021-1/+1
|/ / / /
* | | | Merge topic 'FindOpenGL-GLX-no-GLVND' into release-3.20Brad King2021-03-021-1/+1
|\ \ \ \
| * | | | FindOpenGL: handle GLX without GLVNDBen Boeckel2021-02-261-1/+1