summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | Merge topic 'more-import-export-guide-updates' into release-3.20Brad King2021-03-023-4/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Help/guide: fix the remaining CMake install destinationsBen Boeckel2021-03-013-4/+4
| |/ /
* | | Merge topic 'compilerid_require_success' into release-3.20Brad King2021-03-011-16/+34
|\ \ \ | |/ / |/| |
| * | CMakeDetermineCompilerId: Test without COMPILER_ID_FLAGS if REQUIRE_SUCCESSRaul Tambre2021-02-271-16/+34
|/ /
* | Merge topic 'ci-xcode-12.4' into release-3.20Brad King2021-02-251-6/+6
|\ \ | |/ |/|
| * gitlab-ci: update macOS jobs to use Xcode 12.4Brad King2021-02-251-6/+6
|/
* Merge topic 'nvhpc-minor-fixes' into release-3.20Brad King2021-02-252-0/+4
|\
| * PGI: Explicitly specify CMAKE_CXX98_STANDARD_COMPILE_OPTIONRobert Maynard2021-02-241-0/+2
| * HELP: Update compile-features documentation with missing compilersRobert Maynard2021-02-241-0/+2
|/
* CMake 3.20.0-rc2v3.20.0-rc2Brad King2021-02-241-1/+1
* Merge branch 'release-3.19' into release-3.20Brad King2021-02-240-0/+0
|\
| * CMake 3.19.6v3.19.6Brad King2021-02-241-1/+1
* | Merge topic 'better_cuda_compiler_detection_error_messages' into release-3.20Brad King2021-02-241-5/+5
|\ \
| * | CUDA: Improve error messages when CUDA compiler detection failsRobert Maynard2021-02-231-5/+5
* | | Merge topic 'preset-flag-consistency' into release-3.20Brad King2021-02-2414-15/+56
|\ \ \
| * | | ctest: Add support for '--prefix=<prefix>' form of the argumentBrad King2021-02-234-6/+21
| * | | cmake: Add support for '--build --prefix=<prefix>' form of the argumentBrad King2021-02-233-4/+13
| * | | cmake: Document '--preset <preset>' form of the argumentBrad King2021-02-239-5/+22
* | | | Merge topic 'LINK_LANGUAGE-genex-respects-LINKER_LANGUAGE-property' into rele...Brad King2021-02-245-6/+39
|\ \ \ \
| * | | | Genex: LINK_LANGUAGE respects LINKER_LANGUAGE propertyMarc Chevrier2021-02-235-6/+39
| |/ / /
* | | | Merge topic 'autogen-cmp0116-fix' into release-3.20Brad King2021-02-2425-148/+237
|\ \ \ \
| * | | | Help: Note that CMP0116 is recorded at the time of CC creationKyle Edwards2021-02-231-1/+4
| * | | | Tests: Test Qt autogen target with CMP0116 set to WARNKyle Edwards2021-02-232-0/+3
| * | | | Tests: Test per-CC behavior of CMP0116Kyle Edwards2021-02-233-0/+38
| * | | | Ninja: Use CMP0116 status recorded at time of custom command's creationKyle Edwards2021-02-231-2/+2
| * | | | cmCustomCommand: Record value of CMP0116 at time of creationKyle Edwards2021-02-2318-145/+190
* | | | | Merge branch 'release-3.19' into release-3.20Brad King2021-02-240-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'backport-3.19-preset-no-comments' into release-3.19Brad King2021-02-248-7/+25
| |\ \ \ \
| * \ \ \ \ Merge branch 'ninja-status-stderr' into release-3.19Brad King2021-02-233-0/+12
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'preset-no-comments' into release-3.20Brad King2021-02-2410-20/+26
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'backport-3.19-preset-no-comments' into preset-no-commentsBrad King2021-02-248-7/+25
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | CMakePresets.json: Remove undocumented support for commentsKyle Edwards2021-02-248-7/+25
| * | | | | | | Tests: Remove comments from CMakePresetsTest/Good.json.inKyle Edwards2021-02-241-9/+0
| * | | | | | | Revert "Help: Document JSON comment support in cmake-presets(7)"Kyle Edwards2021-02-241-4/+1
* | | | | | | | Merge topic 'ninja-status-stderr' into release-3.20Brad King2021-02-243-0/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | |
| * | | | | | Tests: Update for upstream ninja change to write status on stderrBrad King2021-02-233-0/+12
| | |/ / / / | |/| | | |