summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* clang-tidy module: add check for cmStrLen()Kyle Edwards2022-10-194-1/+61
| | | | Co-Authored-by: Joe Blaauboer <jblaauboer67@gmail.com>
* Merge branch 'release-3.25'Brad King2022-10-190-0/+0
|\
| * CMake 3.25.0-rc2v3.25.0-rc2Brad King2022-10-191-1/+1
| |
* | Merge branch 'release-3.25'Brad King2022-10-190-0/+0
|\ \ | |/
| * Merge topic 'cmake-presets-output-junit' into release-3.25Brad King2022-10-1919-11/+229
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bea4ed5430 CTest: Add support for outputJUnitFile in presets 9270a02003 CMakePresets.json: Add outputJUnitFile to test presets schema 757786bb73 Tests: Add test for outputLogFile in CMakePresets.json b68c3596e7 CMakePresets.json: Disallow extra properties in test output schema Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: scivision <michael@scivision.dev> Merge-request: !7806
* | \ Merge topic 'cmake-presets-output-junit'Brad King2022-10-1919-11/+229
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | bea4ed5430 CTest: Add support for outputJUnitFile in presets 9270a02003 CMakePresets.json: Add outputJUnitFile to test presets schema 757786bb73 Tests: Add test for outputLogFile in CMakePresets.json b68c3596e7 CMakePresets.json: Disallow extra properties in test output schema Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: scivision <michael@scivision.dev> Merge-request: !7806
| * | CTest: Add support for outputJUnitFile in presetsKyle Edwards2022-10-1811-8/+131
| | | | | | | | | | | | Fixes: #22400
| * | CMakePresets.json: Add outputJUnitFile to test presets schemaKyle Edwards2022-10-184-0/+14
| | |
| * | Tests: Add test for outputLogFile in CMakePresets.jsonKyle Edwards2022-10-183-1/+12
| | |
| * | CMakePresets.json: Disallow extra properties in test output schemaKyle Edwards2022-10-185-3/+73
| | | | | | | | | | | | And add test for testOutputTruncation being unsupported.
* | | Merge branch 'release-3.25'Brad King2022-10-190-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'mingw-unc' into release-3.25Brad King2022-10-191-0/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9777e4c30e MinGW Makefiles: Quote UNC paths on command lines Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7802
* | \ \ Merge topic 'mingw-unc'Brad King2022-10-191-0/+7
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 9777e4c30e MinGW Makefiles: Quote UNC paths on command lines Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7802
| * | | MinGW Makefiles: Quote UNC paths on command linesEd Hartley2022-10-181-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UNC paths (starting with `\\`) need quotes when generating MinGW Makefiles to avoid gmake interpreting the first `\` as an escape character. Fixes: #24061
* | | | Merge branch 'release-3.25'Brad King2022-10-190-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'release-3.24' into release-3.25Brad King2022-10-190-0/+0
| |\ \ \
* | \ \ \ Merge branch 'release-3.24'Brad King2022-10-190-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'release-3.23' into release-3.24Brad King2022-10-190-0/+0
| |\ \ \ \
| * \ \ \ \ Merge branch 'try_compile-CMP0128' into release-3.24Brad King2022-10-186-0/+72
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !7803
| * \ \ \ \ \ Merge branch 'android-path-suffixes' into release-3.24Brad King2022-10-181-0/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !7805
* | \ \ \ \ \ \ Merge branch 'release-3.23'Brad King2022-10-190-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 'try_compile-CMP0128' into release-3.23Brad King2022-10-186-0/+72
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | Merge-request: !7803
* | | | | | | | Merge branch 'release-3.25'Brad King2022-10-190-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge topic 'try_compile-CMP0128' into release-3.25Brad King2022-10-196-0/+72
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 50e90e2828 try_compile: Honor CMP0128 setting in test project Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !7803
* | | | | | | | Merge topic 'try_compile-CMP0128'Brad King2022-10-196-0/+72
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 50e90e2828 try_compile: Honor CMP0128 setting in test project Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !7803
| * | | | | | | try_compile: Honor CMP0128 setting in test projectBrad King2022-10-186-0/+72
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some projects pass a raw `-std=` flag to the compiler in the `try_compile` project. If they do not set CMP0128 to NEW, we should not append a `-std=` flag where we did not before the policy was added. Fixes: #24063
* | | | | | | Merge branch 'release-3.25'Brad King2022-10-190-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'android-path-suffixes' into release-3.25Brad King2022-10-191-0/+6
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e5b48a7b1 Android: Avoid searching API level directories matching architecture bitness Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7805
* | | | | | | Merge topic 'android-path-suffixes'Brad King2022-10-191-0/+6
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e5b48a7b1 Android: Avoid searching API level directories matching architecture bitness Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7805
| * | | | | | Android: Avoid searching API level directories matching architecture bitnessSergiu Deitsch2022-10-181-0/+6
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When cross-compiling for Android, the library path suffixes `/<number>/` refer to API level specific platform libraries instead of architecture bitness. Disable path suffix use under NDK to avoid incorrect inclusion of API level specific libraries below the targeted API level. Fixes: #23830
* | | | | | CMake Nightly Date StampKitware Robot2022-10-191-1/+1
| | | | | |
* | | | | | Merge branch 'release-3.25'Brad King2022-10-180-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'doc-flag-init' into release-3.25Brad King2022-10-1811-57/+66
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | e0075799ed Help: Clarify how language-specific flag environment values are used Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7804
* | | | | | Merge topic 'doc-flag-init'Brad King2022-10-1811-57/+66
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | e0075799ed Help: Clarify how language-specific flag environment values are used Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7804
| * | | | | Help: Clarify how language-specific flag environment values are usedBrad King2022-10-1811-57/+66
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous the wording could be interpreted to mean that the environment variables like `CXXFLAGS` are used exclusively to initialize the corresponding cache entries like `CMAKE_CXX_FLAGS`. State clearly that the value will be used in combination with builtin defaults. Issue: #23956
* | | | | Merge branch 'release-3.25'Brad King2022-10-180-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'release-3.24' into release-3.25Brad King2022-10-180-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
* | | | | Merge branch 'release-3.24'Brad King2022-10-180-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'FindJNI-android-api' into release-3.24Brad King2022-10-171-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !7801
* | \ \ \ \ Merge branch 'release-3.25'Brad King2022-10-180-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge topic 'FindJNI-android-api' into release-3.25Brad King2022-10-181-2/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | c833df0924 FindJNI: replace CMAKE_ANDROID_API by CMAKE_SYSTEM_VERSION Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7801
* | | | | | Merge topic 'FindJNI-android-api'Brad King2022-10-181-2/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | c833df0924 FindJNI: replace CMAKE_ANDROID_API by CMAKE_SYSTEM_VERSION Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7801
| * | | | | FindJNI: replace CMAKE_ANDROID_API by CMAKE_SYSTEM_VERSIONSergiu Deitsch2022-10-171-2/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 00c4f488f2 (FindJNI: support Android NDK, 2022-03-18, v3.24.0-rc1~325^2) we used `CMAKE_ANDROID_API` to check the Android API level. However, `CMAKE_SYSTEM_VERSION` is the authoritative value. When cross-compiling for Android, an unset `CMAKE_ANDROID_API` can result in failure to locate JNI because the `NativeHelper` component cannot be found. In this case, the component is falsely assumed to be available by default (and thus required) since the comparison against an unset `CMAKE_ANDROID_API` variable evaluates to true. Use `CMAKE_SYSTEM_VERSION` to determine the Android API level instead. Issue: #23830
* | | | | Merge branch 'release-3.25'Brad King2022-10-180-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'doc-CMAKE_ANDROID_API' into release-3.25Brad King2022-10-181-3/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a739b55bb6 Help: Clarify historical-only role of CMAKE_ANDROID_API variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7800
* | \ \ \ \ Merge topic 'doc-CMAKE_ANDROID_API'Brad King2022-10-181-3/+4
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | a739b55bb6 Help: Clarify historical-only role of CMAKE_ANDROID_API variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7800
| * | | | | Help: Clarify historical-only role of CMAKE_ANDROID_API variableBrad King2022-10-171-3/+4
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise documentation added by commit 6b84df8da9 (Help: Document cross compiling for Android, 2016-06-20, v3.7.0-rc1~229^2~2) to avoid implying that `CMAKE_ANDROID_API` is interchangeable with `CMAKE_SYSTEM_VERSION`. The latter is the authoritative value of the Android API level. Issue: #23830
* | | | | Merge branch 'release-3.25'Brad King2022-10-180-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'tutorial-step1-standard-required' into release-3.25Brad King2022-10-181-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b7e465be3 Tutorial: Fix variable name typo in step 1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7799
* | \ \ \ \ Merge topic 'tutorial-step1-standard-required'Brad King2022-10-181-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b7e465be3 Tutorial: Fix variable name typo in step 1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7799