summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmake --workflow: print usage and exit on unrecognized argumentKyle Edwards2022-10-265-0/+11
| | | | Issue: #24073
* cmake --workflow: print usage messageKyle Edwards2022-10-251-1/+8
|
* Merge topic 'cmake-presets-list-workflow-type' into release-3.25Brad King2022-10-241-0/+5
|\ | | | | | | | | | | | | | | | | 75cfbef780 cmake: Support --list-presets=workflow Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Tested-by: Craig Scott <craig.scott@crascit.com> Merge-request: !7816
| * cmake: Support --list-presets=workflowKyle Edwards2022-10-211-0/+5
| | | | | | | | Fixes: #24072
* | Merge topic 'doc-ctest' into release-3.25Brad King2022-10-242-0/+13
|\ \ | | | | | | | | | | | | | | | | | | 36d76ed07c Help: cmake(1), ctest(1), versionadded for key flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7815
| * | Help: cmake(1), ctest(1), versionadded for key flagsMichael Hirsch2022-10-212-0/+13
| | |
* | | Merge topic 'fix_narrow_conversion' into release-3.25Brad King2022-10-241-1/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | f3c918ef1b cmGlobalVisualStudioGenerator: Fix compiling as C++20 in VS 2022 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7814
| * | cmGlobalVisualStudioGenerator: Fix compiling as C++20 in VS 2022Werner, Joerg2022-10-211-1/+2
|/ / | | | | | | Adding missing narrow string conversion.
* | Merge topic 'doc-cli-xrefs' into release-3.25Brad King2022-10-2112-33/+35
|\ \ | | | | | | | | | | | | | | | | | | 3043c17039 Help: Add more CLI `:option:` references to various pages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7811
| * | Help: Add more CLI `:option:` references to various pagesAlex Turbov2022-10-2012-33/+35
| | |
* | | Merge topic 'doc-find_package-search-path-versionadded' into release-3.25Brad King2022-10-211-21/+31
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | 65dc8aa8b3 Help: Mention CMake version for a recently-added `find_package` search path 93871cb5a9 Help: Reformat find_package search paths as Sphinx tables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7810
| * | Help: Mention CMake version for a recently-added `find_package` search pathAlex Turbov2022-10-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Add a `versionadded` mark for the search path added by commit e55c154c5b (cmFindPackageCommand: Add one more search path, 2022-06-27, v3.25.0-rc1~339^2~1). Fixes: #24067
| * | Help: Reformat find_package search paths as Sphinx tablesAlex Turbov2022-10-201-21/+29
| |/
* | Merge branch 'release-3.24' into release-3.25Brad King2022-10-210-0/+0
|\ \
| * \ Merge branch 'release-3.23' into release-3.24Brad King2022-10-210-0/+0
| |\ \
| | * \ Merge branch 'filesystem-path-c++03-abi' into release-3.23Brad King2022-10-203-13/+18
| | |\ \ | | | | | | | | | | | | | | | Merge-request: !7813
| * | \ \ Merge branch 'filesystem-path-c++03-abi' into release-3.24Brad King2022-10-203-13/+18
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Merge-request: !7813
| * | | | Merge branch 'test-git-protocol-file' into release-3.24Brad King2022-10-201-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !7812
* | \ \ \ \ Merge topic 'filesystem-path-c++03-abi' into release-3.25Brad King2022-10-213-13/+18
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ee9805ccd1 cm/filesystem: Fix crash with pre-C++11 std::string GNU ABI in C++17 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7813
| * | | | | cm/filesystem: Fix crash with pre-C++11 std::string GNU ABI in C++17Brad King2022-10-203-13/+18
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `remove_filename` and `replace_extension` methods compute an offset between the whole path in a `std::string` and a part of a path in a `std::string_view`. This is done by subtracting their `.data()` pointers. However, C++17 adds a non-const `.data()` through which modification of the string is allowed. This means the copy-on-write implementation used by the pre-C++11 std::string GNU ABI must reallocate if the string has been copied. Our subtraction then computes an offset between two different allocations, which is undefined behavior. The workaround in commit b3ca4f9ad1 (cm/filesystem: Work around crash when compiled for CYGWIN/MSYS runtime, 2021-04-22, v3.21.0-rc1~271^2~2) avoided the problem by calling the non-const `.data()` to reallocate before constructing the `string_view`. Instead, explicitly call the const `.data()` method on the string, which does not reallocate. Fixes: #22090, #23328
* | | | | Merge topic 'test-git-protocol-file' into release-3.25Brad King2022-10-211-0/+2
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | | | | | | | | | | | | | | 79ce0f434e Tests: Explicitly allow usage of git file-based protocol in test cases Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7812
| * | | Tests: Explicitly allow usage of git file-based protocol in test casesBrad King2022-10-201-0/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Due to CVE-2022-39253, Git 2.30.6 sets `protocol.file.allow=user` by default. The change has also been backported to other Git versions by distros. This breaks some of our test cases that use the file-based protocol locally to simulate real workflows without requiring network access. In these cases the file protocol is safe, so explicitly enable it in the tests.
* | | CMake 3.25.0-rc2v3.25.0-rc2Brad King2022-10-191-1/+1
| | |
* | | 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
| * | | 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 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
| * | | | 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.24' into release-3.25Brad 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.23Brad King2022-10-186-0/+72
| | |\ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !7803
| * | \ \ \ 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 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
| * | | | | | 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 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
| * | | | | 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
* | | | | 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
| * | | | 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.24' into release-3.25Brad King2022-10-180-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'FindJNI-android-api' into release-3.24Brad King2022-10-171-2/+2
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !7801
* | \ \ \ 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
| * | | | 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 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
| * | | | 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 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
| * | | | Tutorial: Fix variable name typo in step 1Steven2022-10-171-1/+1
| |/ / / | | | | | | | | | | | | `CMAKE_CXX_REQUIRED_STANDARD` => `CMAKE_CXX_STANDARD_REQUIRED`
* | | | Merge topic 'serenityos-no-libdl' into release-3.25Brad King2022-10-181-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4fa0d157bc SerenityOS: Unset CMAKE_DL_LIBS because LibDl no longer exists Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7797