summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* CMake 3.20.0-rc5v3.20.0-rc5Brad King2021-03-171-1/+1
* Merge branch 'release-3.19' into release-3.20Brad King2021-03-170-0/+0
|\
| * Merge branch 'backport-3.19-ci-vs-16.8-in-16.9' into release-3.19Brad King2021-03-172-4/+4
| |\
| * \ Merge branch 'ninja-regenerate-no-recompact' into release-3.19Brad King2021-03-161-2/+3
| |\ \
| * \ \ Merge branch 'FindPkgConfig-NAMES_PER_DIR' into release-3.19Brad King2021-03-161-1/+4
| |\ \ \
* | \ \ \ Merge topic 'ninja-regenerate-no-recompact' into release-3.20Brad King2021-03-171-2/+3
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Ninja: Do not recompact deps log in regeneration during a buildBrad King2021-03-161-2/+3
| |/ / /
* | | | Merge topic 'FindPkgConfig-NAMES_PER_DIR' into release-3.20Brad King2021-03-171-1/+4
|\ \ \ \ | | |/ / | |/| |
| * | | FindPkgConfig: Restore preference for first pkg-config in PATHBrad King2021-03-161-1/+4
| |/ /
* | | Merge branch 'ci-vs-16.8-in-16.9' into release-3.20Brad King2021-03-170-0/+0
|\ \ \
| * \ \ Merge branch 'backport-3.19-ci-vs-16.8-in-16.9' into ci-vs-16.8-in-16.9Brad King2021-03-170-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | gitlab-ci: Fix using VS 16.8 toolset under VS 16.9 in CMake 3.19 branchBrad King2021-03-172-4/+4
| | |/
* | | Merge branch 'invalid-configure-preset' into release-3.20Brad King2021-03-1718-14/+62
|\ \ \
| * | | Tests: update tests to catch invalid configurePreset at read-timeSam Freed2021-03-1516-10/+49
| * | | Fail at read-time if configurePreset field invalidSam Freed2021-03-152-4/+13
* | | | 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-1035-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
|\ \ \ | |/ / |/| |