summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cpack-archive-custom-extension'Brad King2022-09-073-0/+24
|\ | | | | | | | | | | | | | | cc3cd8bc2a CPack: allow custom file extension in archive generator Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7563
| * CPack: allow custom file extension in archive generatorAndrey Filipenkov2022-09-013-0/+24
| |
* | Merge branch 'release-3.24'Brad King2022-09-070-0/+0
|\ \
| * \ Merge topic 'zlib-windows-cross-compile-fix' into release-3.24Brad King2022-09-071-4/+20
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 67b6f1a09b FindZLIB: fix CMAKE_FIND_LIBRARY_PREFIXES being unset when it was empty Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7647
* | \ \ Merge topic 'zlib-windows-cross-compile-fix'Brad King2022-09-071-4/+20
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 67b6f1a09b FindZLIB: fix CMAKE_FIND_LIBRARY_PREFIXES being unset when it was empty Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7647
| * | | FindZLIB: fix CMAKE_FIND_LIBRARY_PREFIXES being unset when it was emptyDaniel Scharrer2022-09-061-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMAKE_FIND_LIBRARY_PREFIXES and CMAKE_FIND_LIBRARY_SUFFIXES have different behavior when undefined and when defined but empty: Empty means to use an empty prefix/suffix while undefined means to use a hardcoded default for the platform we are running on. Unfortunately, set(a ${b}) will undefine a when b is empty, meaning that when targeting a platform where either of these variables is empty (e.g. Windows where CMAKE_FIND_LIBRARY_PREFIXES is empty) the unpatched FindZLIB code ends up unsetting that variable, causing all subsequent find_library calls to use the hardcoded default for the runtime platform (e.g. "lib" for CMAKE_FIND_LIBRARY_PREFIXES on Linux). On the other hand, set(a "${b}") will always define a to be empty but defined so we have to do this dance to fully preserve the state of these variables.
* | | | Merge branch 'release-3.24'Brad King2022-09-070-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'release-3.23' into release-3.24Brad King2022-09-070-0/+0
| |\ \ \
* | \ \ \ Merge branch 'release-3.23'Brad King2022-09-070-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'findCUDAToolkit_declare_deps_for_targets_once' into release-3.23Brad King2022-09-061-17/+20
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !7633
* | \ \ \ \ Merge branch 'release-3.24'Brad King2022-09-070-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge topic 'findCUDAToolkit_declare_deps_for_targets_once' into release-3.24Brad King2022-09-071-17/+20
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | f0918fe505 FindCUDAToolkit: Correctly state cusolver and cublas dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7633
* | | | | | Merge topic 'findCUDAToolkit_declare_deps_for_targets_once'Brad King2022-09-071-17/+20
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | f0918fe505 FindCUDAToolkit: Correctly state cusolver and cublas dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7633
| * | | | | FindCUDAToolkit: Correctly state cusolver and cublas dependenciesRobert Maynard2022-09-021-17/+20
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #23920
* | | | | | CMake Nightly Date StampKitware Robot2022-09-071-1/+1
| | | | | |
* | | | | | Merge topic 'implicit-link-info-msvc'Brad King2022-09-067-6/+103
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 93f2cd5b7c CMakeParseImplicitLinkInfo: Better detection of msvc Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7619
| * | | | | | CMakeParseImplicitLinkInfo: Better detection of msvcRobert Maynard2022-09-027-6/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the compiler id information in addition to checking for `cl.exe`.
* | | | | | | Merge branch 'release-3.24'Craig Scott2022-09-060-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge topic 'truncation_test' into release-3.24Craig Scott2022-09-0611-11/+18
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb55d5e730 RunCMakeTest: fix Truncation test definition Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7632
* | \ \ \ \ \ \ Merge topic 'truncation_test'Craig Scott2022-09-0611-11/+18
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb55d5e730 RunCMakeTest: fix Truncation test definition Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7632
| * | | | | | | RunCMakeTest: fix Truncation test definitionFrank Winklmeier2022-09-0511-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `ctest_test` and `CTestCommandLine` truncation tests had multiple problems: - escape expected result string to avoid regex matching - specify the truncation size - pass the truncation mode correctly into the test definition - use unique test names Issue: #23868
* | | | | | | | Merge branch 'release-3.24'Craig Scott2022-09-060-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'help-windows-registry' into release-3.24Craig Scott2022-09-061-64/+79
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b30ca2436 Help: cmake-developer: Add section for Windows registry access. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7642
* | \ \ \ \ \ \ \ Merge topic 'help-windows-registry'Craig Scott2022-09-061-64/+79
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b30ca2436 Help: cmake-developer: Add section for Windows registry access. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7642
| * | | | | | | | Help: cmake-developer: Add section for Windows registry access.Marc Chevrier2022-09-041-64/+79
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes: #23905
* | | | | | | | CMake Nightly Date StampKitware Robot2022-09-061-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'release-3.24'Craig Scott2022-09-050-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'doc-fetchcontent-gtest-example' into release-3.24Craig Scott2022-09-051-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | daa2a6cda6 Help: Fix wrong casing of GTest in FetchContent integration example Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7644
* | | | | | | | Merge topic 'doc-fetchcontent-gtest-example'Craig Scott2022-09-051-2/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | daa2a6cda6 Help: Fix wrong casing of GTest in FetchContent integration example Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7644
| * | | | | | | Help: Fix wrong casing of GTest in FetchContent integration exampleCraig Scott2022-09-041-2/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge topic 'sphinx-issue-urls'Craig Scott2022-09-051-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff2e7ceb66 QtHelp: Update Sphinx issue URLs in comments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7639
| * | | | | | | QtHelp: Update Sphinx issue URLs in commentsFeRD (Frank Dana)2022-09-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QtHelp Sphinx generation code contains two links to Sphinx issues that used old, dead BitBucket URLs. Those issues were migrated to GitHub, so the dead links can be replaced with working ones.
* | | | | | | | Merge topic 'doc-guide-typos'Craig Scott2022-09-052-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 83c89cea5a Help: Fix minor typos in guides Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7641
| * | | | | | | | Help: Fix minor typos in guidestocic2022-09-042-2/+2
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2022-09-051-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'release-3.24'Craig Scott2022-09-040-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'ExternalProject-default-git-tag' into release-3.24Craig Scott2022-09-041-0/+3
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2a21555ea7 ExternalProject: note the default of `GIT_TAG` being `master` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7631
* | | | | | | | | Merge topic 'ExternalProject-default-git-tag'Craig Scott2022-09-041-0/+3
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | 2a21555ea7 ExternalProject: note the default of `GIT_TAG` being `master` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7631
| * | | | | | | ExternalProject: note the default of `GIT_TAG` being `master`Ben Boeckel2022-09-021-0/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported on Discourse: https://discourse.cmake.org/t/fetchcontent-makeavailable-invalid-reference-master/6386
* | | | | | | CMake Nightly Date StampKitware Robot2022-09-041-1/+1
| |/ / / / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2022-09-031-1/+1
| | | | | |
* | | | | | Merge topic 'cmake-presets-package'Brad King2022-09-0238-28/+1250
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8d73085f4 CPack: Add support for presets b699610df4 cmCMakePresetsGraph: Add package presets 215b9148eb CMakePresets.json: Fix formatting of --list-presets=all Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7621
| * | | | | | CPack: Add support for presetsKyle Edwards2022-08-3127-13/+872
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #23117
| * | | | | | cmCMakePresetsGraph: Add package presetsKyle Edwards2022-08-316-1/+288
| | | | | | |
| * | | | | | CMakePresets.json: Fix formatting of --list-presets=allKyle Edwards2022-08-317-14/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only print an extra newline after a section if that section was actually printed.
* | | | | | | Merge topic 'E-capabilities-tls'Brad King2022-09-024-1/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d0bb3286f0 cmake -E capabilities: Tell whether TLS is enabled Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7593
| * | | | | | | cmake -E capabilities: Tell whether TLS is enabledKyle Edwards2022-09-014-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20507
* | | | | | | | Merge topic 'cmake-gui-platform-env'Brad King2022-09-021-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5671c5270b cmake-gui: Fix selected item mismatched CMAKE_GENERATOR_PLATFORM env Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7629
| * | | | | | | | cmake-gui: Fix selected item mismatched CMAKE_GENERATOR_PLATFORM envdou fu2022-09-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first empty item in the combobox causes a misalignment with the actual setting by `CMAKE_GENERATOR_PLATFORM` environment variable.
* | | | | | | | | Merge topic 'CMakeFindFrameworks-brew-arm64'Brad King2022-09-021-1/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5bfe33f092 CMakeFindFrameworks: Fix Brew 'Frameworks' path on Apple Silicon Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7618