summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* gitlab-ci: add variable for job to control its ctest build nameBrad King2021-03-171-1/+5
* Merge branch 'release-3.20'Brad King2021-03-170-0/+0
|\
| * CMake 3.20.0-rc5v3.20.0-rc5Brad King2021-03-171-1/+1
* | Merge branch 'release-3.20'Brad King2021-03-170-0/+0
|\ \ | |/
| * Merge branch 'release-3.19' into release-3.20Brad King2021-03-170-0/+0
| |\
* | \ Merge branch 'release-3.19'Brad 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 branch 'release-3.20'Brad King2021-03-170-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge topic 'ninja-regenerate-no-recompact' into release-3.20Brad King2021-03-171-2/+3
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
* | | | | | Merge topic 'ninja-regenerate-no-recompact'Brad King2021-03-171-2/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Ninja: Do not recompact deps log in regeneration during a buildBrad King2021-03-161-2/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'release-3.20'Brad King2021-03-170-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'FindPkgConfig-NAMES_PER_DIR' into release-3.20Brad King2021-03-171-1/+4
| |\ \ \ \ | | | |/ / | | |/| |
* | | | | Merge topic 'FindPkgConfig-NAMES_PER_DIR'Brad King2021-03-171-1/+4
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | FindPkgConfig: Restore preference for first pkg-config in PATHBrad King2021-03-161-1/+4
| | |/ / | |/| |
* | | | Merge branch 'release-3.20'Brad King2021-03-170-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'ci-vs-16.8-in-16.9' into release-3.20Brad King2021-03-170-0/+0
| |\ \ \
* | \ \ \ Merge branch 'ci-vs-16.8-in-16.9'Brad 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 'release-3.20'Brad King2021-03-170-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'invalid-configure-preset' into release-3.20Brad King2021-03-1718-14/+62
| |\ \ \
* | \ \ \ Merge topic 'fix_ninja_windows_cuda'Brad King2021-03-172-0/+12
|\ \ \ \ \
| * | | | | CUDA: Add support for finding nvcc in CUDA_PATHTobias Ribizel2021-03-152-0/+12
* | | | | | Merge topic 'doc-flag-var-strings'Brad King2021-03-172-0/+5
|\ \ \ \ \ \
| * | | | | | Help: Document that CMAKE_<LANG>_FLAGS[_INIT] are stringsAlexander Richardson2021-03-172-0/+5
* | | | | | | Merge branch 'release-3.20'Brad King2021-03-170-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge topic 'FindOpenMP-IntelLLVM-Windows' into release-3.20Brad King2021-03-171-1/+6
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'FindOpenMP-IntelLLVM-Windows'Brad King2021-03-171-1/+6
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | FindOpenMP: Use -Qiopenmp instead of -fiopenmp for IntelLLVM on WindowsWilliam R. Dieter2021-03-151-1/+6
* | | | | | | | Merge topic 'dev/safreed/invalidconfigurepreset'Brad King2021-03-1718-14/+62
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into invalid-configure-presetKyle Edwards2021-03-16271-625/+2688
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | / / / | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | 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
| | |/ / / / / | |/| | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2021-03-171-1/+1
* | | | | | | Merge topic 'tests-for-xctest_add_bundle'Brad King2021-03-162-0/+43
|\ \ \ \ \ \ \
| * | | | | | | Tests: Add XCTest cases to cover output directory selectionYauheni Khnykin2021-03-122-0/+43
* | | | | | | | Merge topic 'cmake-presets-host-system-name'Brad King2021-03-1615-110/+219
|\ \ \ \ \ \ \ \
| * | | | | | | | CMakePresets.json: Add ${hostSystemName} macroKyle Edwards2021-03-159-1/+58
| * | | | | | | | Help: Fix version numbers in CMakePresets.json documentationKyle Edwards2021-03-151-5/+6
| * | | | | | | | Refactor: Pass CMakePresets.json version to ExpandMacros() functionsKyle Edwards2021-03-152-39/+68
| * | | | | | | | Refactor: Add cmSystemTools::GetSystemName()Kyle Edwards2021-03-155-66/+88
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge topic 'doc-configure_file-cmakedefine01'Brad King2021-03-161-2/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | Help: Clarify configure_file #cmakedefine01 syntax and behaviorElsie Hupp2021-03-151-2/+24
* | | | | | | | | Merge topic 'ExternalData-stop-forking-to-cmake'Brad King2021-03-161-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ExternalData: use `file(CREATE_LINK)`Ben Boeckel2021-03-111-1/+2
| * | | | | | | | | ExternalData: use `file(COPY_FILE)` instead of forking CMakeBen Boeckel2021-03-111-1/+1
* | | | | | | | | | Merge topic 'cstr-cleanup'Brad King2021-03-1611-50/+47
|\ \ \ \ \ \ \ \ \ \