summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-3.20'Brad King2021-02-240-0/+0
|\
| * CMake 3.20.0-rc2v3.20.0-rc2Brad King2021-02-241-1/+1
| |
* | Merge branch 'release-3.20'Brad King2021-02-240-0/+0
|\ \ | |/
| * Merge branch 'release-3.19' into release-3.20Brad King2021-02-240-0/+0
| |\
* | \ Merge branch 'release-3.19'Brad King2021-02-240-0/+0
|\ \ \ | | |/ | |/|
| * | CMake 3.19.6v3.19.6Brad King2021-02-241-1/+1
| | |
* | | Merge topic 'autouic-headers-ninja'Brad King2021-02-248-0/+168
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1265c65b33 AUTOUIC: Collect ui header files for Ninja generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5803
| * | | AUTOUIC: Collect ui header files for Ninja generatorAlexey Edelev2021-02-238-0/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The '<user target>_autogen/timestamp' target supposed to generate ui header files using the 'uic'. Ninja must have information about these header files as a result of generating. The fix collects .ui files of the user target and generates a list of the ui headers that need to be added to the generating results of the '<user target>_autogen/timestamp' target. The case when the .ui files are not specified and collected by AUTOUIC from the include directives of the project source files is not covered in this patch. Fixes: #16776
* | | | Merge branch 'release-3.20'Brad King2021-02-240-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge topic 'better_cuda_compiler_detection_error_messages' into release-3.20Brad King2021-02-241-5/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a0fc64ac24 CUDA: Improve error messages when CUDA compiler detection fails Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !5844
* | \ \ \ Merge topic 'better_cuda_compiler_detection_error_messages'Brad King2021-02-241-5/+5
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | a0fc64ac24 CUDA: Improve error messages when CUDA compiler detection fails Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !5844
| * | | | CUDA: Improve error messages when CUDA compiler detection failsRobert Maynard2021-02-231-5/+5
| | | | |
* | | | | Merge branch 'release-3.20'Brad King2021-02-240-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'preset-flag-consistency' into release-3.20Brad King2021-02-2414-15/+56
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6fa3647023 ctest: Add support for '--prefix=<prefix>' form of the argument 3357d37761 cmake: Add support for '--build --prefix=<prefix>' form of the argument 2f13fdef0a cmake: Document '--preset <preset>' form of the argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5849
* | \ \ \ \ Merge topic 'preset-flag-consistency'Brad King2021-02-2414-15/+56
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6fa3647023 ctest: Add support for '--prefix=<prefix>' form of the argument 3357d37761 cmake: Add support for '--build --prefix=<prefix>' form of the argument 2f13fdef0a cmake: Document '--preset <preset>' form of the argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5849
| * | | | | ctest: Add support for '--prefix=<prefix>' form of the argumentBrad King2021-02-234-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The main `cmake --preset` argument for configure presets supports both forms, so support it for `ctest --preset` too. Fixes: #21855
| * | | | | cmake: Add support for '--build --prefix=<prefix>' form of the argumentBrad King2021-02-233-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The main `cmake --preset` argument for configure presets supports both forms, so support it for `cmake --build --preset` too. Issue: #21855
| * | | | | cmake: Document '--preset <preset>' form of the argumentBrad King2021-02-239-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This form already works. Document it and add tests. Issue: #21855
* | | | | | Merge branch 'release-3.20'Brad King2021-02-240-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'LINK_LANGUAGE-genex-respects-LINKER_LANGUAGE-property' into ↵Brad King2021-02-245-6/+39
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release-3.20 b722eea925 Genex: LINK_LANGUAGE respects LINKER_LANGUAGE property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5841
* | \ \ \ \ \ Merge topic 'LINK_LANGUAGE-genex-respects-LINKER_LANGUAGE-property'Brad King2021-02-245-6/+39
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b722eea925 Genex: LINK_LANGUAGE respects LINKER_LANGUAGE property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5841
| * | | | | | Genex: LINK_LANGUAGE respects LINKER_LANGUAGE propertyMarc Chevrier2021-02-235-6/+39
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If target property LINKER_LANGUAGE is set, LINK_LANGUAGE generator expression evaluation must be always successful. This fix can be helpful to elaborate a solution for issue #21818.
* | | | | | Merge branch 'release-3.20'Brad King2021-02-240-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'autogen-cmp0116-fix' into release-3.20Brad King2021-02-2425-148/+237
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 339dbc901f Help: Note that CMP0116 is recorded at the time of CC creation e3740e020e Tests: Test Qt autogen target with CMP0116 set to WARN cf34011ce7 Tests: Test per-CC behavior of CMP0116 3a95503512 Ninja: Use CMP0116 status recorded at time of custom command's creation f01f10e8fb cmCustomCommand: Record value of CMP0116 at time of creation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5848
* | \ \ \ \ \ Merge topic 'autogen-cmp0116-fix'Brad King2021-02-2425-148/+237
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 339dbc901f Help: Note that CMP0116 is recorded at the time of CC creation e3740e020e Tests: Test Qt autogen target with CMP0116 set to WARN cf34011ce7 Tests: Test per-CC behavior of CMP0116 3a95503512 Ninja: Use CMP0116 status recorded at time of custom command's creation f01f10e8fb cmCustomCommand: Record value of CMP0116 at time of creation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5848
| * | | | | | 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.20'Brad King2021-02-240-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'release-3.19' into release-3.20Brad King2021-02-240-0/+0
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge branch 'release-3.19'Brad King2021-02-240-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'backport-3.19-preset-no-comments' into release-3.19Brad King2021-02-248-7/+25
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !5853
| * \ \ \ \ \ \ Merge branch 'ninja-status-stderr' into release-3.19Brad King2021-02-233-0/+12
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !5850
* | \ \ \ \ \ \ \ Merge branch 'release-3.20'Brad King2021-02-240-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'preset-no-comments' into release-3.20Brad King2021-02-2410-20/+26
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 06e16ea008 Merge branch 'backport-3.19-preset-no-comments' into preset-no-comments afaa69f5b3 Tests: Remove comments from CMakePresetsTest/Good.json.in 4a92277f45 Revert "Help: Document JSON comment support in cmake-presets(7)" 431dd59b5e CMakePresets.json: Remove undocumented support for comments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5853
* | \ \ \ \ \ \ \ \ Merge topic 'preset-no-comments'Brad King2021-02-2410-20/+26
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 06e16ea008 Merge branch 'backport-3.19-preset-no-comments' into preset-no-comments afaa69f5b3 Tests: Remove comments from CMakePresetsTest/Good.json.in 4a92277f45 Revert "Help: Document JSON comment support in cmake-presets(7)" 431dd59b5e CMakePresets.json: Remove undocumented support for comments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5853
| * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21858
| * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 8f1e607ed9 (Help: Document JSON comment support in cmake-presets(7), 2021-02-18). The support for comments was a mistake when the feature was implemented in 3.19, and is being removed.
* | | | | | | | | | Merge branch 'release-3.20'Brad King2021-02-240-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'ninja-status-stderr' into release-3.20Brad King2021-02-243-0/+12
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | / / / / / | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | d33c2c93d8 Tests: Update for upstream ninja change to write status on stderr Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5850
* | | | | | | | | Merge topic 'ninja-status-stderr'Brad King2021-02-243-0/+12
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d33c2c93d8 Tests: Update for upstream ninja change to write status on stderr Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5850
| * | | | | | | | Tests: Update for upstream ninja change to write status on stderrBrad King2021-02-233-0/+12
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upstream ninja commit `ad3d29fb53` (Put builder output through status interface) from ninja PR 1899 changed the status output from stdout to stderr. In particular, `ninja: no work to do` is now printed on stderr. Update our RunCMake tests to accept this difference. A few RunCMake test cases check for `ninja: no work to do`. For those, move the message to stdout using `RunCMake_TEST_OUTPUT_MERGE`. The rest of the test cases do not care about the message, so remove it from the actual stderr content before comparing against that expected.
* | | | | | | | CMake Nightly Date StampKitware Robot2021-02-241-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'release-3.20'Brad King2021-02-230-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'ci-macos-arm64' into release-3.20Brad King2021-02-239-89/+146
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 397ced99d7 gitlab-ci: Add macos-arm64 jobs for Ninja and Xcode 0755c2ffbb gitlab-ci: rename macos build and test jobs to macos-x86_64 73150a3798 ci: add sccache 0.2.15 custom build for aarch64-apple-darwin cab41b96ac ci: update to sccache 0.2.15 on linux builds 8dcbe5688a ci: Use Qt macOS 10.13+ package for macOS build and test jobs Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5851
* | | | | | | | Merge topic 'ci-macos-arm64'Brad King2021-02-239-89/+146
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 397ced99d7 gitlab-ci: Add macos-arm64 jobs for Ninja and Xcode 0755c2ffbb gitlab-ci: rename macos build and test jobs to macos-x86_64 73150a3798 ci: add sccache 0.2.15 custom build for aarch64-apple-darwin cab41b96ac ci: update to sccache 0.2.15 on linux builds 8dcbe5688a ci: Use Qt macOS 10.13+ package for macOS build and test jobs Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5851
generated by cgit v0.12 at 2025-02-14 12:49:53 (GMT)