summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'ninja-multi-export-all-symbols'Brad King2020-06-012-1/+4
|\
| * Ninja Multi-Config: Fix bug in CMAKE_WINDOWS_EXPORT_ALL_SYMBOLSKyle Edwards2020-05-292-1/+4
* | CMake Nightly Date StampKitware Robot2020-06-011-1/+1
* | CMake Nightly Date StampKitware Robot2020-05-311-1/+1
* | CMake Nightly Date StampKitware Robot2020-05-301-1/+1
* | Merge topic 'gitlab-ci-concurrency-tags'Brad King2020-05-291-0/+4
|\ \
| * | gitlab-ci: pin macOS and Windows jobs to nonconcurrent runnersBrad King2020-05-291-0/+4
|/ /
* | Merge topic 'gitlab-ci-xcode-11.5'Brad King2020-05-291-2/+2
|\ \
| * | gitlab-ci: update macOS jobs to Xcode 11.5Brad King2020-05-291-2/+2
|/ /
* | Merge topic 'gitlab-ci-toolsets'Brad King2020-05-292-2/+7
|\ \
| * | gitlab-ci: pin windows and macos jobs to runners with matching toolsetsBrad King2020-05-292-2/+7
* | | Merge topic 'msbuild-utf8-disable'Brad King2020-05-291-2/+5
|\ \ \ | |/ / |/| |
| * | VS: Drop StdOutEncoding with VS 16.6 pending investigationBrad King2020-05-291-2/+5
|/ /
* | Merge topic 'alias-cannot-overwrite-another-target'Brad King2020-05-2911-1/+100
|\ \
| * | ALIAS target: cannot overwrite an existing targetMarc Chevrier2020-05-2811-1/+100
* | | Merge topic 'bugfix-gcev'Brad King2020-05-291-1/+1
|\ \ \
| * | | server-mode: Fix regression in cache entry reportingVitaly Stakhovsky2020-05-281-1/+1
* | | | Merge branch 'release-3.17'Brad King2020-05-290-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge topic 'FindSubversion-xcode-removed' into release-3.17Brad King2020-05-291-2/+11
| |\ \ \
* | \ \ \ Merge topic 'FindSubversion-xcode-removed'Brad King2020-05-291-2/+11
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | FindSubversion: Do not accept macOS stub without Xcode implementationBrad King2020-05-281-2/+11
| |/ / /
* | | | CMake Nightly Date StampKitware Robot2020-05-291-1/+1
| |_|/ |/| |
* | | Merge topic 'macos-pin-xcode-versions'Brad King2020-05-284-2/+14
|\ \ \
| * | | ci: disable java detectionBen Boeckel2020-05-283-2/+11
| * | | gitlab-ci: pin macOS to a specific Xcode versionBen Boeckel2020-05-281-0/+3
|/ / /
* | | Merge branch 'release-3.17'Brad King2020-05-280-0/+0
|\ \ \ | |/ /
| * | CMake 3.17.3v3.17.3Brad King2020-05-281-1/+1
* | | Merge topic 'update-kwsys'Brad King2020-05-2825-3005/+75
|\ \ \
| * \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-05-2725-3005/+75
| |\ \ \
| | * | | KWSys 2020-05-27 (a3263389)KWSys Upstream2020-05-2725-3005/+75
* | | | | Merge topic 'multi-ninja-pch-object-library'Brad King2020-05-282-95/+150
|\ \ \ \ \
| * | | | | Multi-Ninja: Fix reusable PCHs for MSVCCristian Adam2020-05-272-95/+150
* | | | | | Merge topic 'reduce-try_compile'Brad King2020-05-282-0/+303
|\ \ \ \ \ \
| * | | | | | Hard-code some try_compile results for third-party librariesBrad King2020-05-272-0/+303
| |/ / / / /
* | | | | | Merge branch 'release-3.17'Brad King2020-05-280-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge topic 'openssl-3.0.0' into release-3.17Brad King2020-05-281-0/+9
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'openssl-3.0.0'Brad King2020-05-281-0/+9
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | FindOpenSSL: Detect OpenSSL 3.0.0Vitezslav Cizek2020-05-271-0/+9
* | | | | | | Merge branch 'release-3.17'Brad King2020-05-280-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'fix-cpack-deb-generating-empty-paragraph' into release-3.17Brad King2020-05-283-12/+12
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'fix-cpack-deb-generating-empty-paragraph'Brad King2020-05-283-12/+12
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | CPack-deb: don't add a line with a dot to pkg descJonathan Verner2020-05-273-12/+12
| |/ / / / / /
* | | | | | | CMake Nightly Date StampKitware Robot2020-05-281-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge topic 'cuda_user_architectures'Brad King2020-05-271-6/+33
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | CUDA: Throw error if user-specified architectures don't workRaul Tambre2020-05-261-6/+33
* | | | | | Merge topic 'gitlab-ci-dir'Brad King2020-05-271-5/+4
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | gitlab-ci: Use stable build path on WindowsBrad King2020-05-271-2/+1
| * | | | | gitlab-ci: Use a shorter work directoryBrad King2020-05-271-4/+4
|/ / / / /
* | | | | Merge topic 'cuda_lib_x64'Brad King2020-05-271-0/+2
|\ \ \ \ \
| * | | | | CUDA: Check for lib/x64 library directory in Internal/CUDAToolkitRaul Tambre2020-05-261-0/+2
| |/ / / /