summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Help: Add more CLI `:option:` references to various pagesAlex Turbov2022-10-2012-33/+35
|
* 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
| * | | | SerenityOS: Unset CMAKE_DL_LIBS because LibDl no longer existsAndrew Kaster2022-10-171-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Serenity's LibDl was merged into LibC to simplify the build and port infrastructure [1]. Set `CMAKE_DL_LIBS` to the empty string to match what other platforms do. Update the platform module added by commit 45ca894164 (SerenityOS: Add Platform module, 2022-01-02, v3.25.0-rc1~635^2). [1] https://github.com/SerenityOS/serenity/pull/14854 Issue: #23589
* | | | Merge topic 'revert_nvcc_marking_include_as_system' into release-3.25Brad King2022-10-186-31/+6
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | d0e52219eb CUDA: Revert "Always mark cuda toolkit as system include" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7798
| * | | CUDA: Revert "Always mark cuda toolkit as system include"Robert Maynard2022-10-176-31/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to revert this change as it can disable error messages when compiling invalid CUDA code. This reverts commit ea659b155d (CUDA: Always mark cuda toolkit as system include, 2022-06-27, v3.25.0-rc1~269^2).
* | | | Merge topic 'xcode-framework-consumption' into release-3.25Brad King2022-10-173-5/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4aa86da827 Xcode: ensure framework with custom output directory can be consumed Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Jason Juang <jasjuang@gmail.com> Merge-request: !7791
| * | | | Xcode: ensure framework with custom output directory can be consumedMarc Chevrier2022-10-143-5/+40
| |/ / / | | | | | | | | | | | | Fixes: #24046
* | | | Merge branch 'release-3.24' into release-3.25Brad King2022-10-170-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'release-3.23' into release-3.24Brad King2022-10-170-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'doc-timestamp-f' into release-3.23Brad King2022-10-141-0/+2
| | |\ \ | | | | | | | | | | | | | | | Merge-request: !7796
| * | \ \ Merge branch 'doc-timestamp-f' into release-3.24Brad King2022-10-141-0/+2
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Merge-request: !7796
* | | | | Merge topic 'doc-timestamp-f' into release-3.25Brad King2022-10-171-0/+2
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | | | | | | | | | 7d25ae7350 Help: Add versionadded for string(TIMESTAMP) %f specifier Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7796
| * | | Help: Add versionadded for string(TIMESTAMP) %f specifierBrad King2022-10-141-0/+2
| | |/ | |/| | | | | | | | | | This was accidentally left out of commit c050d6a01e (string(TIMESTAMP): add %f specifier for microseconds, 2022-01-27, v3.23.0-rc1~59^2).
* | | Merge topic 'FindGLUT-pkg-config-HINTS' into release-3.25Brad King2022-10-141-60/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a2fc4b6257 FindGLUT: Drop the now-unnecessary exclusion of pkg-config for multiconfig a60a33dcb0 FindGLUT: Drop the now-unnecessary ALLOW_SYSTEM_CFLAGS logic 4ad57224b5 FindGLUT: Use pkg-config's results as HINTS for normal search Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Christopher Degawa <cddegawa@gmail.com> Merge-request: !7770
| * | | FindGLUT: Drop the now-unnecessary exclusion of pkg-config for multiconfigleha-bot2022-10-131-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit e0a62b84b5 (FindGLUT: On Windows and with multiple config generator do not use pkg-config, 2022-09-27, v3.25.0-rc1~69^2). We now call `select_library_configurations()` even after using pkg-config, which will handle the absent libraries on Debug/Release configurations. Issue: #24028
| * | | FindGLUT: Drop the now-unnecessary ALLOW_SYSTEM_CFLAGS logicleha-bot2022-10-131-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 8041ca5df0 (FindGLUT: Fix GLUT_INCLUDE_DIRS with pkg-config and /usr/include, 2022-05-11, v3.24.0-rc1~151^2). As the main code path will always do `find_path()` which respects the `CMAKE_FIND_ROOT_PATH_MODE_INCLUDE` variable and will search in system paths depending on that variable. Issue: #23474, #24028
| * | | FindGLUT: Use pkg-config's results as HINTS for normal searchleha-bot2022-10-131-41/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit f90d15458a (FindGLUT: Use pkg-config to find flags if available, 2021-06-11, v3.22.0-rc1~469^2), pkg-config results are used directly. However, this is not compatible with other features of CMake's find logic such as `CMAKE_FIND_ROOT_PATH` and per-config results. Switch to a convention already used by pkg-config support in other find modules, in which the pkg-config results are only used as hints for the main search logic. Fixes: #24028
* | | | Merge topic 'doc-typo' into release-3.25Brad King2022-10-142-8/+8
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | f9fd27a5ee Help: Fix typo that crashes older pygments lexers Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: Craig Scott <craig.scott@crascit.com> Merge-request: !7792
| * | | Help: Fix typo that crashes older pygments lexersBrad King2022-10-132-8/+8
|/ / / | | | | | | | | | | | | | | | | | | | | | In commit cb14ae2b87 (try_compile: Add SOURCE_FROM_{ARG,VAR}, 2022-09-21, v3.25.0-rc1~94^2~2) we accidentally added unbalanced closing `]` characters in the `try_compile` and `try_run` signatures. Fixes: #24053
* | | Merge topic 'correct_cufile_linkage' into release-3.25Brad King2022-10-131-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | eefba0fb02 FindCUDAToolkit: cuFile_rdma_static needs to link to cuFile_static Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7785
| * | | FindCUDAToolkit: cuFile_rdma_static needs to link to cuFile_staticRobert Maynard2022-10-121-1/+1
|/ / /
* | | CMake 3.25.0-rc1v3.25.0-rc1Brad King2022-10-121-1/+1
| | |
* | | Merge topic 'doc-gen' into release-3.25Brad King2022-10-121-15/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e8b8bf4ef Help: Document version when COMPILE_LANGUAGE genex accepts multiple languages 16f37ea7a0 Help: Document comma-separation in some generator expressions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7784
generated by cgit v0.12 at 2025-01-22 11:10:40 (GMT)