summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Tests: Add cases covering bad ctest output truncation typesBrad King2022-09-077-0/+10
| | | | Issue: #23869
* ctest: print error for invalid CTEST_CUSTOM_TEST_OUTPUT_TRUNCATIONFrank Winklmeier2022-09-071-1/+5
| | | | | | | | | Print an error message for invalid values of `CTEST_CUSTOM_TEST_OUTPUT_TRUNCATION` in a ctest dashboard script. The option was added by commit 140704d443 (ctest: add option for output truncation, 2022-03-07, v3.24.0-rc1~513^2). Fixes: #23869
* 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
| * 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.23' into release-3.24Brad 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 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
| * | | FindCUDAToolkit: Correctly state cusolver and cublas dependenciesRobert Maynard2022-09-021-17/+20
| | | | | | | | | | | | | | | | Fixes #23920
* | | | 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
| * | | | 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 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
| * | | | | Help: cmake-developer: Add section for Windows registry access.Marc Chevrier2022-09-041-64/+79
| |/ / / / | | | | | | | | | | | | | | | Fixes: #23905
* | | | | 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
| * | | | Help: Fix wrong casing of GTest in FetchContent integration exampleCraig Scott2022-09-041-2/+2
| | |_|/ | |/| |
* | | | 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
| * | | 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
* | | Merge topic 'FindPostgreSQL-brew' into release-3.24Brad King2022-09-011-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f799e0f23d FindPostgreSQL: Add brew-style directories to search path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7627
| * | | FindPostgreSQL: Add brew-style directories to search pathparkesb2022-08-311-0/+3
| | | | | | | | | | | | | | | | | | | | As of 14.5, homebrew names PostgreSQL directories with the version number, e.g., `postgresql@14`.
* | | | Merge topic 'Link-MACOSX_BUNDLE' into release-3.24Brad King2022-09-016-0/+45
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | f5a441a616 Xcode: Fix erroneous MACOSX_BUNDLE link Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7624
| * | | Xcode: Fix erroneous MACOSX_BUNDLE linkMarc Chevrier2022-08-316-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit a2cfa2da4f (GenEx/LINK_LIBRARY: Add features for framework support on Apple, 2022-02-10, v3.24.0-rc1~661^2) accidentally removed a `GetParentDirectory` call. Restore it. Fixes: #23891
* | | | Merge topic 'CMAKE_FIND_USE_INSTALL_PREFIX-support-staging-prefix' into ↵Brad King2022-08-3112-28/+157
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release-3.24 0fc10bb19b CMAKE_FIND_USE_INSTALL_PREFIX considers CMAKE_STAGING_PREFIX 43d31c5198 cmFindBase: Refactor CMAKE_FIND_USE_INSTALL_PREFIX handling Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7623
| * | | | CMAKE_FIND_USE_INSTALL_PREFIX considers CMAKE_STAGING_PREFIXRobert Maynard2022-08-3012-12/+118
| | | | | | | | | | | | | | | | | | | | Fixes #23900
| * | | | cmFindBase: Refactor CMAKE_FIND_USE_INSTALL_PREFIX handlingRobert Maynard2022-08-301-22/+45
| | | | |
* | | | | Merge topic 'test-symlinks-with-ccache' into release-3.24Brad King2022-08-311-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d3ac4e8246 Tests: Teach RunCMake.SymlinkTrees to tolerate CCACHE_BASEDIR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7622
| * | | | | Tests: Teach RunCMake.SymlinkTrees to tolerate CCACHE_BASEDIRBrad King2022-08-301-0/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the test is driven with a `ccache`-wrapped compiler then the `CCACHE_BASEDIR` environment variable might break paths the test checks. Fixes: #23885
* | | | | Merge topic 'doc-CMP0134-fixes' into release-3.24Brad King2022-08-314-24/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7dca3807f8 Help: Fix typos, grammar and formatting in CMP0134 policy docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7620
| * | | | | Help: Fix typos, grammar and formatting in CMP0134 policy docsCraig Scott2022-08-304-24/+21
| |/ / / /
* | | | | Merge topic 'automoc-silence-warnings' into release-3.24Brad King2022-08-311-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fc8628389f automoc: avoid more compiler warnings in linker-warning-silencing code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7617
| * | | | | automoc: avoid more compiler warnings in linker-warning-silencing codeAlbert Astals Cid2022-08-301-0/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise the approach from commit 844244ccdc (automoc: avoid compiler warnings in linker-warning-silencing code, 2022-08-10, v3.24.1~6^2) to avoid `-Wmissing-declarations` warnings too. Issue: #23823
* | | | | Merge topic 'FindBoost-1.80' into release-3.24Brad King2022-08-311-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 468a995346 FindBoost: Add support for Boost 1.80 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: مهدي شينون (Mehdi Chinoune) <mehdi.chinoune@hotmail.com> Merge-request: !7600
| * | | | FindBoost: Add support for Boost 1.80Kargatum2022-08-301-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the list of known versions. Run the command cmake -DBOOST_DIR=/path/to/boost_1_80_0 \ -P Utilities/Scripts/BoostScanDeps.cmake to extract dependencies from the 1.80.0 source tree. They are the same as 1.79's dependencies, so just update the version check for warning about newer versions.
* | | | Merge topic 'correct_cupti_search_paths' into release-3.24Craig Scott2022-08-261-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f3c3589f1 FindCUDAToolkit: Search the cuda toolkit include path for cupti Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7608
| * | | | FindCUDAToolkit: Search the cuda toolkit include path for cuptiRobert Maynard2022-08-241-1/+1
| |/ / /
* | | | Merge topic 'file-set-source-group' into release-3.24Kyle Edwards2022-08-258-5/+44
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 970052fedd FILE_SET: Fix source group detection bcc3965813 Tests: Fix VS10Project SourceGroupTreeCMakeLists check Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7609
| * | | | FILE_SET: Fix source group detectionKyle Edwards2022-08-246-1/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call MatchChildrenFiles() instead of MatchesFiles() in order to account for files being in subgroups of source groups. Fixes: #23880
| * | | | Tests: Fix VS10Project SourceGroupTreeCMakeLists checkKyle Edwards2022-08-242-4/+5
|/ / / / | | | | | | | | | | | | | | | | Fix an `IN LISTS` loop, fix a variable check, and escape backslashes in the regex used to search for source group names.
* | | | Merge topic 'ci-msvc-14.33' into release-3.24Brad King2022-08-222-23/+44
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b87645b6a5 gitlab-ci: Update non-packaging Windows builds to MSVC 14.33 toolset cb8b27a901 gitlab-ci: Use separate MSVC toolset specification for packaging jobs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7597
| * | | | gitlab-ci: Update non-packaging Windows builds to MSVC 14.33 toolsetBrad King2022-08-191-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore the change from commit 6f17996edc (gitlab-ci: Update Windows builds to MSVC 14.33 toolset, 2022-08-15, v3.24.1~3^2), but not for packaging jobs. `cmake-gui` is still buggy when compiled with the newer toolset. Issue: #23859
| * | | | gitlab-ci: Use separate MSVC toolset specification for packaging jobsBrad King2022-08-192-19/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be useful for testing CMake with one version of MSVC while packaging the official binaries with another version. Issue: #23859
* | | | | Merge topic 'doc-ctest_test-output-control' into release-3.24Craig Scott2022-08-201-2/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | fadc93286a Help: Add crossrefs to ctest output control options 8981e88b18 Help: Add missing closing quote on C++ example Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7595
| * | | | Help: Add crossrefs to ctest output control optionsCraig Scott2022-08-191-1/+4
| | | | |
| * | | | Help: Add missing closing quote on C++ exampleCraig Scott2022-08-191-1/+1
| |/ / /
* | | | Merge topic 'doc-var-refs' into release-3.24Brad King2022-08-191-6/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 159acea394 Help: Clarify that variable references may use cache entries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7589
| * | | | Help: Clarify that variable references may use cache entriesBrad King2022-08-181-6/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify in `cmake-language(7)` that a variable lookup may use a cache entry if the variable is not set. Fix misleading text in added by commit 8ba2a8d4a4 (Help: short/long variable reference in if command, 2018-11-01, v3.14.0-rc1~408^2~2). Fixes: #23863
* | | | Merge topic 'ci-cmake-update' into release-3.24Brad King2022-08-194-9/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05a1464689 ci: use CMake 3.24.1 c3793b4157 CMake 3.24.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7590
| * | | | ci: use CMake 3.24.1Brad King2022-08-182-6/+6
| |/ / /
| * | | CMake 3.24.1v3.24.1Brad King2022-08-172-3/+4
|/ / /
* | | Merge topic 'revert-ci-msvc-14.33' into release-3.24Brad King2022-08-171-7/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3a7202bfc7 gitlab-ci: Revert Windows builds from MSVC 14.33 to MSVC 14.32 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7586
| * | | gitlab-ci: Revert Windows builds from MSVC 14.33 to MSVC 14.32 toolsetBrad King2022-08-171-7/+7
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 6f17996edc (gitlab-ci: Update Windows builds to MSVC 14.33 toolset, 2022-08-15). A `cmake-gui` built with the MSVC 14.33 toolset emits spurious errors when configuring CMake projects, even when the adjacent `cmake` binary succeeds reliably. Revert to the known-working MSVC 14.32 toolset pending further investigation. Issue: #23859
* | | Merge topic 'FindVulkan-tolerate-FATAL_ERROR' into release-3.24Brad King2022-08-172-0/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9063674517 Help: Add 3.24 release note about FindVulkan component enforcement bc01362368 FindVulkan: Restore tolerance of unknown FATAL_ERROR component Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7583
generated by cgit v0.12 at 2025-08-26 20:06:24 (GMT)