summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMakePresets.json: Split cmakeGeneratorConfig fieldKyle Edwards2020-10-2233-95/+241
| | | | | | | | Make this field separate for both architecture and toolset. Allow architecture and toolset to be either strings or objects with value and strategy fields. Fixes: #21317
* Merge topic 'cmake-presets-invalid-macro' into release-3.19Kyle Edwards2020-10-2217-183/+268
|\ | | | | | | | | | | | | 638557cbfe CMakePresets.json: Properly report macro expansion errors Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5397
| * CMakePresets.json: Properly report macro expansion errorsKyle Edwards2020-10-2117-183/+268
| | | | | | | | | | | | | | | | Make a distinction between strings which simply use the $vendor{<...>} macro, which is valid but makes it unusable by CMake, and strings which actually contain invalid macro expansions. Fixes: #21308
* | Merge topic 'cmake-presets-boolean-cache' into release-3.19Kyle Edwards2020-10-226-7/+71
|\ \ | |/ |/| | | | | | | | | 920d180047 CMakePresets.json: Allow boolean for cache variable value Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5398
| * CMakePresets.json: Allow boolean for cache variable valueKyle Edwards2020-10-216-7/+71
|/ | | | Fixes: #21327
* Merge topic 'cmakepresets-schema' into release-3.19Kyle Edwards2020-10-2110-2/+315
|\ | | | | | | | | | | | | | | | | 21bc2fd945 CI: Install jsonschema for schema testing e3bce8edf4 Tests: Add JSON schema validation to CMakePresets.json tests 0307f7c980 Help: Add JSON schema for CMakePresets.json Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5366
| * CI: Install jsonschema for schema testingKyle Edwards2020-10-203-1/+3
| |
| * Tests: Add JSON schema validation to CMakePresets.json testsKyle Edwards2020-10-204-1/+61
| |
| * Help: Add JSON schema for CMakePresets.jsonBen McMorran2020-10-203-0/+251
| |
* | Merge topic 'ci-win-python' into release-3.19Brad King2020-10-202-0/+44
|\ \ | |/ |/| | | | | | | | | | | 8f7fef629b ci: add Python to PATH on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !5403
| * ci: add Python to PATH on WindowsBrad King2020-10-202-0/+44
|/ | | | | | | Our test suite searches for a Python interpreter to perform some extra checks. Our CI base images for Linux have Python available. Update our Windows jobs to provide a Python interpreter for our test suite to find consistently between the build and test steps.
* Merge topic 'cmake-presets-doc-move' into release-3.19Kyle Edwards2020-10-206-332/+388
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4a123fc28c Help: Clarify purpose of warnings and errors 6c74bcfc20 Help: Make architecture and toolset descriptions generic 45766789a0 Help: Add inheritance to CMakePresets.json example 88c9d6f6eb Help: Add documentation for debug field efab856008 Help: Show environment field 2208db114c Help: Show multiple ways of doing cacheVariables d30f85193f Help: Move vendor field into example b9c8c57860 Help: s/unusedVars/unusedCli/ ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5373
| * Help: Clarify purpose of warnings and errorsKyle Edwards2020-10-191-4/+4
| |
| * Help: Make architecture and toolset descriptions genericKyle Edwards2020-10-191-4/+4
| |
| * Help: Add inheritance to CMakePresets.json exampleKyle Edwards2020-10-191-0/+7
| |
| * Help: Add documentation for debug fieldKyle Edwards2020-10-191-0/+20
| | | | | | | | Oops!
| * Help: Show environment fieldKyle Edwards2020-10-192-0/+5
| |
| * Help: Show multiple ways of doing cacheVariablesKyle Edwards2020-10-192-3/+5
| | | | | | | | | | This demonstrates both the simple string and the complex object, and ensures that they get automated testing.
| * Help: Move vendor field into exampleKyle Edwards2020-10-192-14/+12
| | | | | | | | | | This ensures that the vendor field gets automated testing from the example.
| * Help: s/unusedVars/unusedCli/Kyle Edwards2020-10-191-1/+1
| | | | | | | | | | | | This was a mistake in the documentation. Fixes: #21303
| * Help: Move CMakePresets.json documentation into a separate fileKyle Edwards2020-10-194-329/+353
| |
* | Merge topic 'find_package-check-dir' into release-3.19Brad King2020-10-201-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 0356b81525 find_package: Fix regression in searching root prefix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5396
| * | find_package: Fix regression in searching root prefixBrad King2020-10-191-1/+1
|/ / | | | | | | | | | | | | | | Fix the check added by commit 2ff1693066 (find_package: avoid showing files as directories when searching config files, 2020-09-30, v3.19.0-rc1~67^2) to avoid skipping the root prefix `/`. Fixes: #21324
* | Merge topic 'FindPython-support-version-3.10' into release-3.19Brad King2020-10-191-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 23cd98a66a FindPython: Add support of version 3.10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5383
| * | FindPython: Add support of version 3.10Marc Chevrier2020-10-161-1/+1
| | |
* | | Merge topic 'separate_arguments-no-args' into release-3.19Brad King2020-10-194-0/+20
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 747f80fe82 separate_arguments: Fix crash on *_COMMAND with no arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5382
| * | separate_arguments: Fix crash on *_COMMAND with no argumentsRobert Bozzetto2020-10-164-0/+20
| |/ | | | | | | Fixes: #21320
* | Merge topic 'doc-CMP0111' into release-3.19Brad King2020-10-195-15/+25
|\ \ | | | | | | | | | | | | | | | | | | | | | 5c3a91c808 CMP0111: Clarify that the new error is on a missing property setting Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex Reinking <alex_reinking@berkeley.edu> Merge-request: !5385
| * | CMP0111: Clarify that the new error is on a missing property settingBrad King2020-10-165-15/+25
| |/ | | | | | | The previous wording could be confused with the file missing on disk.
* | Merge topic 'sccache-macos-without-timeouts' into release-3.19Brad King2020-10-191-4/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | b0fe666846 ci: use a patched sccache on macOS Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !5394
| * | ci: use a patched sccache on macOSBen Boeckel2020-10-191-4/+12
|/ / | | | | | | | | | | | | This version is much less likely to timeout on server startup since it runs the expensive computation in a background thread. See https://github.com/mozilla/sccache/pull/868 for the status.
* | Merge topic 'cmake-gui-disable-presets' into release-3.19Craig Scott2020-10-173-22/+24
|\ \ | | | | | | | | | | | | | | | | | | | | | d471406f0b CMake GUI: Disable preset fields instead of hiding them Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !5374
| * | CMake GUI: Disable preset fields instead of hiding themKyle Edwards2020-10-163-22/+24
| | |
* | | Merge topic 'file-configure-angle-brackets' into release-3.19Brad King2020-10-167-20/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 06a9a3bdc3 file(CONFIGURE): Allow angle brackets in content Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5379
| * | | file(CONFIGURE): Allow angle brackets in contentCristian Adam2020-10-157-20/+9
| | | | | | | | | | | | | | | | Fixes: #21306
* | | | Merge topic 'CheckSource-Fortran' into release-3.19Brad King2020-10-1612-9/+51
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c4c636cef5 Tests: Add cases for CheckSource{Compiles,Runs} bad arguments 1e519df025 CheckSource{Runs,Compiles}: Fix default Fortran source extension Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5378
| * | | | Tests: Add cases for CheckSource{Compiles,Runs} bad argumentsBrad King2020-10-158-0/+32
| | | | |
| * | | | CheckSource{Runs,Compiles}: Fix default Fortran source extensionMichael Hirsch2020-10-154-9/+19
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 357e2ef429 (CheckSoureRuns: Add a unified way to check if a source runs, 2020-09-14, v3.19.0-rc1~118^2), the default Fortran source file extension was accidentally changed from `.F90` to `.F`. Fix that. In commit 10ae907de0 (CheckSoureCompiles: Add a unified way to check if a source compiles, 2020-09-14, v3.19.0-rc1~118^2~1), the default Fortran source extension was correctly preserved as `.F`, but `.F90` is a better default both for consistency and modern usage. Use that for direct calls to the `check_source_compiles` macro. Update our original `check_fortran_source_compiles` implementation to use `.F` by default as it did before. Fixes: #21307
* | | | Merge topic 'iar-obj-declutter' into release-3.19Brad King2020-10-161-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b357f78196 IAR: Use .o object file extension with IAR-Ilink toolchains Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5380
| * | | | IAR: Use .o object file extension with IAR-Ilink toolchainsFelipe Torrezan2020-10-151-0/+1
| |/ / / | | | | | | | | | | | | | | | | The compiler default extension for its objects is `.o`. Prefer that over `.obj`.
* | | | Merge topic 'fix-refactor-generator-configs' into release-3.19Brad King2020-10-164-3/+27
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | b9cb1d324d Fix regression in test/install/package configuration selection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5381
| * | | Fix regression in test/install/package configuration selectionBrad King2020-10-154-3/+27
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 7a969fe21d (cmMakefile: Refactor API to better handle empty config values, 2020-06-30, v3.19.0-rc1~567^2), calls to `GetGeneratorConfigs` that pass `OnlyMultiConfig` only want to get any configurations listed if the generator is multi-config. Fix the implementation to actually do that. Fixes: #21316
* | | Merge topic 'cmake-E-cat-binary' into release-3.19Brad King2020-10-1513-54/+109
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7a5f28318 cmake: Fix '-E cat' command for binary files on Windows 90b39a5209 cmConsoleBuf: Factor out cout/cerr console buffer management f1fdd15863 clang-format: Fix include block order in ctest.cxx and cpack.cxx Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5364
| * | | cmake: Fix '-E cat' command for binary files on WindowsJohnny Jazeix2020-10-147-7/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset `std::cout` to write in binary mode with no encoding conversions. Co-Author: Brad King <brad.king@kitware.com> Fixes: #21295
| * | | cmConsoleBuf: Factor out cout/cerr console buffer managementBrad King2020-10-148-36/+66
| | | |
| * | | clang-format: Fix include block order in ctest.cxx and cpack.cxxBrad King2020-10-142-13/+14
| | | |
* | | | Merge topic 'bootstrap-make-smake' into release-3.19Brad King2020-10-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e7ece1416 bootstrap: add smake as known make processors Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5372
| * | | | bootstrap: add smake as known make processorsIssam E. Maghni2020-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | As found in “Modules/CMakeUnixFindMake.cmake”
* | | | | Merge topic 'bootstrap-ninja-samu' into release-3.19Brad King2020-10-141-1/+1
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | | | | | | | | f0ac977d3c bootstrap: add samu as known ninja processors Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5371
| * | | bootstrap: add samu as known ninja processorsIssam E. Maghni2020-10-141-1/+1
|/ / / | | | | | | | | | As found in “Modules/CMakeNinjaFindMake.cmake”