summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* presets: Improve JSON parser and error messagesMartin Duffy2023-03-29114-1213/+1930
|
* Merge topic 'Apple-text-Stubs-imported-configurations'Brad King2023-03-065-2/+25
|\ | | | | | | | | | | | | 2e24123186 Apple: text-based stubs: manage imported configurations mapping Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8283
| * Apple: text-based stubs: manage imported configurations mappingMarc Chevrier2023-03-055-2/+25
| |
* | Merge topic 'doc-CMAKE_NINJA_OUTPUT_PATH_PREFIX'Brad King2023-03-061-13/+24
|\ \ | | | | | | | | | | | | | | | | | | dbcae48e3a Help: Clarify usage of CMAKE_NINJA_OUTPUT_PATH_PREFIX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8284
| * | Help: Clarify usage of CMAKE_NINJA_OUTPUT_PATH_PREFIXBrad King2023-03-031-13/+24
| |/ | | | | | | Issue: #24566
* | Merge branch 'release-3.26'Brad King2023-03-060-0/+0
|\ \
| * \ Merge topic 'clang-16-cxx-modules' into release-3.26Brad King2023-03-063-22/+44
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3fe8e33f27 Clang: Record Clang 16.0 flags for our experimental C++ modules support Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: scivision <michael@scivision.dev> Acked-by: Alex <leha-bot@yandex.ru> Merge-request: !8285
* | \ \ Merge topic 'clang-16-cxx-modules'Brad King2023-03-063-22/+44
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 3fe8e33f27 Clang: Record Clang 16.0 flags for our experimental C++ modules support Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: scivision <michael@scivision.dev> Acked-by: Alex <leha-bot@yandex.ru> Merge-request: !8285
| * | | Clang: Record Clang 16.0 flags for our experimental C++ modules supportBrad King2023-03-033-22/+44
| | | | | | | | | | | | | | | | LLVM/Clang 16.0 now contains official support for what CMake needs.
* | | | Merge branch 'release-3.26'Brad King2023-03-060-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'release-3.25' into release-3.26Brad King2023-03-060-0/+0
| |\ \ \
* | \ \ \ Merge branch 'release-3.25'Brad King2023-03-060-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'release-3.24' into release-3.25Brad King2023-03-030-0/+0
| |\ \ \ \
| * \ \ \ \ Merge branch 'GoogleTest-type-param-suite' into release-3.25Brad King2023-03-036-4/+68
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !8282
* | \ \ \ \ \ Merge branch 'release-3.24'Brad King2023-03-060-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch 'release-3.23' into release-3.24Brad King2023-03-030-0/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'GoogleTest-type-param-suite' into release-3.24Brad King2023-03-036-4/+68
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | Merge-request: !8282
* | | | | | | | Merge branch 'release-3.23'Brad King2023-03-060-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'GoogleTest-type-param-suite' into release-3.23Brad King2023-03-036-4/+68
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | Merge-request: !8282
* | | | | | | | Merge branch 'release-3.26'Brad King2023-03-060-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge topic 'GoogleTest-type-param-suite' into release-3.26Brad King2023-03-066-4/+68
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | / / | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | 9aa9032266 GoogleTest: Restore suite name for type-parametrized tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8282
* | | | | | | Merge topic 'GoogleTest-type-param-suite'Brad King2023-03-066-4/+68
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9aa9032266 GoogleTest: Restore suite name for type-parametrized tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8282
| * | | | | | GoogleTest: Restore suite name for type-parametrized testsBrad King2023-03-036-4/+68
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a regression from commit 073dd1bd81 (GoogleTest: Change format for typed tests, 2022-02-07, v3.23.0-rc1~4^2) in the suite name detection. Co-authored-by: Evgeniy Shcherbina <ixsci@pm.me> Fixes: #24563
* | | | | | CMake Nightly Date StampKitware Robot2023-03-061-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2023-03-051-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2023-03-041-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'DxxxxWarnings'Brad King2023-03-031-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 442170a5e7 cm_cxx_features: Ignore MSVC command-line warnings (Dxxxx) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8277
| * | | | | cm_cxx_features: Ignore MSVC command-line warnings (Dxxxx)Roffild2023-03-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Dxxxx warning range is for command-line warnings [1]. These are incidental and should not affect the result of the feature check. [1] https://learn.microsoft.com/en-us/cpp/error-messages/tool-errors/command-line-errors-d8000-through-d9999
* | | | | | Merge topic 'update-kwsys'Brad King2023-03-031-29/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1caf5cbd6a Merge branch 'upstream-KWSys' into update-kwsys 5433eea1a9 KWSys 2023-03-02 (ea806689) Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8278
| * \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2023-03-021-29/+34
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2023-03-02 (ea806689)
| | * | | | | | KWSys 2023-03-02 (ea806689)KWSys Upstream2023-03-021-29/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit ea806689bd184c7c3c5e68afcae52384d349def6 (master). Upstream Shortlog ----------------- scivision (1): e76a8438 Remove try_compile logging in favor of CMake>=3.26 configure log
* | | | | | | | Merge branch 'release-3.26'Brad King2023-03-030-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch 'release-3.25' into release-3.26Brad King2023-03-030-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
* | | | | | | | Merge branch 'release-3.25'Brad King2023-03-030-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'ExternalProject-revert-install' into release-3.25Brad King2023-03-035-5/+18
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !8279
* | \ \ \ \ \ \ \ Merge branch 'release-3.26'Brad King2023-03-030-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'ExternalProject-revert-install' into release-3.26Brad King2023-03-035-5/+18
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 771387523a ExternalProject: Restore driving install through build system Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Acked-by: Craig Scott <craig.scott@crascit.com> Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !8279
* | | | | | | | | Merge topic 'ExternalProject-revert-install'Brad King2023-03-035-5/+18
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 771387523a ExternalProject: Restore driving install through build system Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Acked-by: Craig Scott <craig.scott@crascit.com> Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !8279
| * | | | | | | | ExternalProject: Restore driving install through build systemBrad King2023-03-025-5/+18
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 66b5d51f38 (ExternalProject: Install CMake projects using 'cmake --install', 2022-09-08, v3.25.0-rc1~150^2). It changed the ExternalProject install step command from: cmake --build <dir> --target install --config <cfg> to: cmake --install <dir> --config <cfg> The latter command no longer runs the external project build system during the install step. We could consider using the commands: cmake --build <dir> --target all --config <cfg> cmake --install <dir> --config <cfg> as the install step, but if `CMAKE_SKIP_INSTALL_ALL_DEPENDENCY` is used in the external project, that can change semantics too. Revert the original change pending further investigation on other ways to support its motivating use case. Add a test covering the previously-regressed use case. Fixes: #24567 Issue: #23946
* | | | | | | | Merge branch 'release-3.26'Brad King2023-03-030-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'doc-block' into release-3.26Brad King2023-03-031-0/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2931f078dc Help:cmake-language: note new block() command scope Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8276
* | \ \ \ \ \ \ \ Merge topic 'doc-block'Brad King2023-03-031-0/+3
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2931f078dc Help:cmake-language: note new block() command scope Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8276
| * | | | | | | | Help:cmake-language: note new block() command scopescivision2023-03-021-0/+3
| |/ / / / / / /
* | | | | | | | Merge topic 'ninja-multi-output-path-prefix'Brad King2023-03-034-10/+26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df38eaab2c Ninja Multi-Config: Write output path prefix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8280
| * | | | | | | | Ninja Multi-Config: Write output path prefixKyle Edwards2023-03-024-10/+26
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes: #24566
* | | | | | | | Merge topic 'doc-IMPORTED_CONFIGURATIONS'Brad King2023-03-032-8/+26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8adcb73956 Help:IMPORTED_CONFIGURATIONS: Mention relation to IMPORTED_LOCATION e1032a22eb Help:IMPORTED_IMPLIB: Mention IMPORTED_IMPLIB_<CONFIG> variant Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8281
| * | | | | | | | Help:IMPORTED_CONFIGURATIONS: Mention relation to IMPORTED_LOCATIONBrad King2023-03-021-8/+17
| | | | | | | | |
| * | | | | | | | Help:IMPORTED_IMPLIB: Mention IMPORTED_IMPLIB_<CONFIG> variantBrad King2023-03-021-0/+9
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This is already done in `IMPORTED_LOCATION` documentation.
* | | | | | | | CMake Nightly Date StampKitware Robot2023-03-031-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'TargetRunTimeDllDirs'Kyle Edwards2023-03-025-27/+90
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a2c9c4f202 Add test for the new TARGET_RUNTIME_DLL_PATHS genex aa68de0a27 TARGET_RUNTIME_DLLS: minor refactoring of shared-check.cmake 2ce3d62ffb Help: add documentation for the new TARGET_RUNTIME_DLL_DIRS genex c351dcd967 TARGET_RUNTIME_DLL_DIRS: add the new genex to cmGeneratorExpressionNode 064c3244da TARGET_RUNTIME_DLLS: fix test for this genex Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Acked-by: Alex <leha-bot@yandex.ru> Merge-request: !8247