summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-3.24'Brad King2022-07-250-0/+0
|\
| * Merge topic 'revert-vs-ZERO_CHECK-proj' into release-3.24Brad King2022-07-254-251/+34
| |\ | | | | | | | | | | | | | | | | | | 289932ded0 VS: Revert "Write ZERO_CHECK.proj for VS19 and above" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7499
* | \ Merge topic 'revert-vs-ZERO_CHECK-proj'Brad King2022-07-254-251/+34
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26b724cf2b Merge branch 'backport-3.24-revert-vs-ZERO_CHECK-proj' 289932ded0 VS: Revert "Write ZERO_CHECK.proj for VS19 and above" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7499
| * \ \ Merge branch 'backport-3.24-revert-vs-ZERO_CHECK-proj'Brad King2022-07-224-251/+34
| |\ \ \ | | | |/ | | |/|
| | * | VS: Revert "Write ZERO_CHECK.proj for VS19 and above"Brad King2022-07-224-251/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit a334f1b906 (VS: Write ZERO_CHECK.proj for VS19 and above, 2021-12-24, v3.24.0-rc1~607^2) and a supporting change from commit 7219988b00 (VS: Exclude ZERO_CHECK.proj from .sln for include_external_msproject, 2022-07-15, v3.24.0-rc4~1^2). The change was made to support `dotnet` tooling in addition to `msbuild`. However, not having `ZERO_CHECK` in the `.sln` breaks common interactive workflows. Revert the change for now. Later it can be re-introduced behind some kind of option that enables `dotnet` support. Fixes: #23726 Issue: #20227
* | | | Merge branch 'release-3.24'Brad King2022-07-250-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge topic 'revert-ui-check' into release-3.24Brad King2022-07-251-16/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 778aaf6fdc AUTOUIC: Revert "Fix internal paths of generated ui_foo.h files" Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7498
* | \ \ \ Merge topic 'revert-ui-check'Brad King2022-07-251-16/+12
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 778aaf6fdc AUTOUIC: Revert "Fix internal paths of generated ui_foo.h files" Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7498
| * | | | AUTOUIC: Revert "Fix internal paths of generated ui_foo.h files"Brad King2022-07-221-16/+12
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 10668f26c9 (AUTOUIC: Fix internal paths of generated ui_foo.h files, 2022-05-21, v3.24.0-rc3~20^2). It broke some existing projects that use more than one `.ui` file of the same name. Fixes: #23759 Issue: #23523
* | | | Merge topic 'update-kwsys'Brad King2022-07-252-42/+60
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d84355274 Merge branch 'upstream-KWSys' into update-kwsys f98fa3e543 KWSys 2022-07-22 (ac792bf7) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7486
| * \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2022-07-222-42/+60
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2022-07-22 (ac792bf7)
| | * | | KWSys 2022-07-22 (ac792bf7)KWSys Upstream2022-07-222-42/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit ac792bf7cd1ba6a00d8bfa7b9914d1ab9ecf48ea (master). Upstream Shortlog ----------------- Clemens Wasser (3): 1c156fd1 SystemTools: Better GetCasePathName caching 9e48ae84 SystemTools: Readd direct GetCasePathName caching 0cac8ee5 Directory: Use Win32 find file functions
* | | | | Merge topic 'command-arg-parser-result'Brad King2022-07-2565-424/+546
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a18e82e95 cmCMakePathCommand: Report keyword errors via argument parser results 7e4a9afa1a cmCMakeHost*Command: Report keyword errors via argument parser results 74ec6b63c2 cmFileCommand: Report keyword errors via argument parser results e56108f629 cmExecuteProcessCommand: Report keyword errors via argument parser results b7c82b26b0 cmArgumentParser: Capture keyword errors in parse results 50876f6b9a cmArgumentParser: Add structure to capture operational results 5955ec1992 cmArgumentParser: Store keyword action map with explicit name 119e1f7fbc cmArgumentParser: Factor out common static/dynamic implementation ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7488
| * | | | | cmCMakePathCommand: Report keyword errors via argument parser resultsBrad King2022-07-223-37/+37
| | | | | |
| * | | | | cmCMakeHost*Command: Report keyword errors via argument parser resultsBrad King2022-07-223-12/+12
| | | | | |
| * | | | | cmFileCommand: Report keyword errors via argument parser resultsBrad King2022-07-2212-123/+132
| | | | | |
| * | | | | cmExecuteProcessCommand: Report keyword errors via argument parser resultsBrad King2022-07-223-10/+11
| | | | | |
| * | | | | cmArgumentParser: Capture keyword errors in parse resultsBrad King2022-07-223-3/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit f46b2e9142 (cmArgumentParser: Model maybe-missing string with wrapper type, 2022-07-06) we know during parsing whether or not it is an error for a keyword to be missing a value. Record such errors in the parse results structure. Offer clients a helper method to report them. This provides clients with an alternative to manually checking `keywordsMissingValue` and generating their own error message.
| * | | | | cmArgumentParser: Add structure to capture operational resultsBrad King2022-07-222-48/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a way for the parser to record errors or incidental information about the argument parsing operation that clients can inspect afterward. Offer clients a way to hold the structure as part of their arguments structure.
| * | | | | cmArgumentParser: Store keyword action map with explicit nameBrad King2022-07-222-11/+19
| | | | | |
| * | | | | cmArgumentParser: Factor out common static/dynamic implementationBrad King2022-07-221-29/+32
| | | | | |
| * | | | | cmArgumentParser: Track pending keyword explicitlyBrad King2022-07-202-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | Avoid allocating missing keyword vector unnecessarily.
| * | | | | cmArgumentParser: De-duplicate parse loopBrad King2022-07-201-7/+11
| | | | | |
| * | | | | cmArgumentParser: Simplify internal method signaturesBrad King2022-07-203-32/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Record `Parse` parameters during construction of the internal instance instead of passing them to every method.
| * | | | | cmFileCommand: Use cm::optional for keyword argument presenceBrad King2022-07-201-32/+18
| | | | | |
| * | | | | cmCMakePathCommand: Use cm::optional for keyword argument presenceBrad King2022-07-201-34/+26
| | | | | |
| * | | | | cmInstallCommand: Drop unused local variableBrad King2022-07-201-3/+1
| | | | | |
| * | | | | Tests: Add RunCMake.cmake_path cases for BASE_DIRECTORY missing valueBrad King2022-07-202-0/+10
| | | | | |
| * | | | | Tests: Add RunCMake.file-CHMOD cases for keywords missing valuesBrad King2022-07-2013-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These make the existing `no-perms` case redundant, so repurpose it to replace `no-keyword`.
| * | | | | Tests: Simplify RunCMake.file-CHMOD casesBrad King2022-07-2015-72/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run each case as a `cmake -P` script instead of a full project. The caller handles build directory removal and creation.
| * | | | | Tests: Simplify RunCMake.file-CHMOD case namesBrad King2022-07-2021-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | The `CHMOD-` prefix is redundant with the overall test name.
* | | | | | Merge branch 'release-3.24'Craig Scott2022-07-250-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge topic 'doc-CMP0097-FetchContent' into release-3.24Craig Scott2022-07-251-2/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1796ffbde9 Help: CMP0097 applies to FetchContent as well Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7504
* | \ \ \ \ \ Merge topic 'doc-CMP0097-FetchContent'Craig Scott2022-07-251-2/+4
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1796ffbde9 Help: CMP0097 applies to FetchContent as well Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7504
| * | | | | | Help: CMP0097 applies to FetchContent as wellCraig Scott2022-07-241-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The omission of FetchContent_Declare() in the original policy docs was just an oversight.
* | | | | | | Merge branch 'release-3.24'Craig Scott2022-07-250-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'doc-path-genex-corrections' into release-3.24Craig Scott2022-07-251-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c7ab76e0ff Help: Fix wrong syntax for $<PATH:REPLACE_EXTENSION,...> Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7505
* | | | | | | Merge topic 'doc-path-genex-corrections'Craig Scott2022-07-251-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c7ab76e0ff Help: Fix wrong syntax for $<PATH:REPLACE_EXTENSION,...> Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7505
| * | | | | | Help: Fix wrong syntax for $<PATH:REPLACE_EXTENSION,...>Craig Scott2022-07-241-1/+1
| |/ / / / /
* | | | | | CMake Nightly Date StampKitware Robot2022-07-251-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2022-07-241-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2022-07-231-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'FindVulkan-dxc'Brad King2022-07-225-0/+138
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1277b873c9 FindVulkan: Add `dxc` (DirectX Shader Compiler) component Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7474
| * | | | | FindVulkan: Add `dxc` (DirectX Shader Compiler) componentHellsingDarge2022-07-205-0/+138
| | | | | |
* | | | | | Merge topic 'FindOpenMP-no-force-flags'Brad King2022-07-221-13/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 878655384e FindOpenMP: Do not overwrite user-set FLAGS, LIB_NAMES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7487
| * | | | | | FindOpenMP: Do not overwrite user-set FLAGS, LIB_NAMESBalthasar Reuter2022-07-201-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 2dbff623f9 (FindOpenMP: Save flags/libs in cache entries each time they are detected, 2020-02-07, v3.17.0-rc1~10^2~1) we replace both `OpenMP_${LANG}_FLAGS` and `OpenMP_${LANG}_LIB_NAMES` with detected flags if either one is not set. That can overwrite user-provided flags. Update the logic for C, CXX, and Fortran to initialize each `OpenMP_${LANG}_{FLAGS,LIB_NAMES}` variable only if it has not already been set by the user. Fixes: #23743
* | | | | | | Merge topic 'try_run_split_output'Brad King2022-07-2213-15/+241
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a2cd0687db try_run: Add RUN_OUTPUT_STDOUT_VARIABLE and RUN_OUTPUT_STDERR_VARIABLE. Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7453
| * | | | | | | try_run: Add RUN_OUTPUT_STDOUT_VARIABLE and RUN_OUTPUT_STDERR_VARIABLE.Patrick Northon2022-07-0813-15/+241
| | | | | | | |
* | | | | | | | Merge topic 'tutorial_cdash_rearrange'Brad King2022-07-2219-122/+82
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c77ccec51 Tutorial: Move step 8 to step 5. Shift steps 5-7 to 6-8. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7480
| * | | | | | | | Tutorial: Move step 8 to step 5. Shift steps 5-7 to 6-8.Markus Ferrell2022-07-1919-122/+82
| | | | | | | | |