summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge topic 'cmcldeps-quote-rc' into release-3.28Brad King2023-10-241-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 03080d18eb cmcldeps: Restore support for rc.exe path not fully GetShortPathName-d Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8912
| * | | | | | | cmcldeps: Restore support for rc.exe path not fully GetShortPathName-dBrad King2023-10-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases `GetShortPathNameW` may not remove all spaces. If that happens with the path to `rc.exe`, cmcldeps needs to explicitly quote the path in the command it runs. This was exposed by commit 50a6e78a82 (cmSystemTools::RunSingleCommand(): Replace cmsysProcess with cmUVProcessChain, 2023-07-25, v3.28.0-rc1~138^2~4) because the underlying process execution library no longer reconstructs the command line without quotes around commands without spaces. Fixes: #25355
* | | | | | | | Merge topic 'source_group-TREE-no-FILES' into release-3.28Brad King2023-10-241-2/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8bb949fc30 source_group: Restore behavior of TREE with empty FILES Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8910
| * | | | | | | source_group: Restore behavior of TREE with empty FILESBrad King2023-10-231-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit d85238a2f2 (source_group: Fix TREE without FILES, 2023-06-29, v3.28.0-rc1~399^2~1) we incorrectly treat a FILES argument with no values as if it were not given at all. Fixes: #25353
* | | | | | | | Merge topic 'clang-ansi-color' into release-3.28Brad King2023-10-231-2/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 74b5fae52d Clang: Use -fno-ansi-escape-codes for color diagnostics on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8900
| * | | | | | | Clang: Use -fno-ansi-escape-codes for color diagnostics on WindowsCristian Adam2023-10-231-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -fno-ansi-escape-codes is used only on Windows by Clang. Without the flag color diagnostics are displayed only if clang.exe is executed directly. Build tools like ninja and mingw32-make will not display colored diagnostics. Using -fno-ansi-escape-codes will make the build tools pass the colored diagnostics to the calling application e.g IDE. Fixes: #24235
* | | | | | | | Merge topic 'ninja-better-order-depends' into release-3.28Brad King2023-10-2310-5/+97
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed45432571 cmNinjaTargetGenerator: do not order-depend on C++ module sources 0973cd6702 cmNinjaTargetGenerator: use the file set visibility API 4625170925 cmFileSet: add a query for includeable file set types 51f9d9f0a2 cmNinjaTargetGenerator: avoid traversing old outputs repeatedly Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8902
| * | | | | | | | cmNinjaTargetGenerator: do not order-depend on C++ module sourcesBen Boeckel2023-10-208-5/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | C++ module sources should not be included by any other TUs, so their presence cannot matter for order-only dependencies of the entire target. Exclude them. Update CMP0154 to take this into consideration and add tests to the `CXXModules` suite (which already deals with module support detection).
| * | | | | | | | cmNinjaTargetGenerator: use the file set visibility APIBen Boeckel2023-10-201-1/+1
| | | | | | | | |
| * | | | | | | | cmFileSet: add a query for includeable file set typesBen Boeckel2023-10-202-0/+7
| | | | | | | | |
| * | | | | | | | cmNinjaTargetGenerator: avoid traversing old outputs repeatedlyBen Boeckel2023-10-201-0/+3
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We actually only need to look at outputs just added to the vector, not all outputs that have been detected so far.
* | | | | | | | Merge topic 'doc-modules-deprecated' into release-3.28Brad King2023-10-231-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 75ca6e17f2 Help: Move some deprecated modules to the dedicated sections Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8903
| * | | | | | | Help: Move some deprecated modules to the dedicated sections權少2023-10-201-4/+4
|/ / / / / / /
* | | | | | | Merge topic 'doc-cmake-presets-8' into release-3.28Brad King2023-10-191-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d3978a3835 Help: Document cmake-presets version 8 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8899
| * | | | | | | Help: Document cmake-presets version 8Johel Ernesto Guerrero Peña2023-10-191-0/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was accidentally missed in commit f1a7179520 (presets: Add $schema property to JSON schema, 2023-09-07, v3.28.0-rc1~106^2).
* | | | | | | CMake 3.28.0-rc2v3.28.0-rc2Brad King2023-10-181-1/+1
| | | | | | |
* | | | | | | Merge topic 'cxxmodules-vs-no-synthetic-targets' into release-3.28Brad King2023-10-188-1/+57
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 17fd7fe2ae Tests/CXXModules: test Visual Studio synthetic target error badb6ab120 VS: Explicitly disallow C++ modules provided by imported targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8895
| * | | | | | | Tests/CXXModules: test Visual Studio synthetic target errorBen Boeckel2023-10-176-1/+47
| | | | | | | |
| * | | | | | | VS: Explicitly disallow C++ modules provided by imported targetsBen Boeckel2023-10-172-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `-ifcOnly` flag is understood by MSBuild, but there are unresolved questions about how to integrate with with CMake's model. See: #25328
* | | | | | | | Merge topic 'cxxmodules-flagtable-fixes' into release-3.28Brad King2023-10-182-2/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 50f3c58083 FlagTables: Add entries for cl -scanDependencies flag a22e9e7cf0 FlagTables: `-ifcOutput` takes a subsequent argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8892
| * | | | | | | | FlagTables: Add entries for cl -scanDependencies flagBen Boeckel2023-10-172-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of VS 17.6, MSBuild maps `ModuleDependenciesFile` to this flag instead of the older `-sourceDependencies:directives` flag. Map both flags to `ModuleDependenciesFile` for compatibility.
| * | | | | | | | FlagTables: `-ifcOutput` takes a subsequent argumentBen Boeckel2023-10-172-2/+2
| |/ / / / / / /
* | | | | | | | Merge topic 'cxxmodules-export-fileset-info' into release-3.28Brad King2023-10-1710-13/+69
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f36156740 cxxmodules: include `INCLUDES DESTINATION` directories Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8886
| * | | | | | | | cxxmodules: include `INCLUDES DESTINATION` directoriesBen Boeckel2023-10-1610-13/+69
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These paths are added outside the normal property management mechanisms. Shuttle the value to the C++ module export as needed. Fixes: #25289
* | | | | | | | Merge topic 'execute_process-output_file-directory' into release-3.28Brad King2023-10-177-18/+66
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35f031e3b2 execute_process(): Restore opening files relative to WORKING_DIRECTORY Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8883
| * | | | | | | | execute_process(): Restore opening files relative to WORKING_DIRECTORYKyle Edwards2023-10-167-18/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to 5420639a, execute_process() would open INPUT_FILE, OUTPUT_FILE, and ERROR_FILE relative to the WORKING_DIRECTORY argument if it was provided. Restore this behavior for backwards compatibility. Fixes: #25338
* | | | | | | | | Merge topic 'Tests-NinjaPrivateDeps-error-message' into release-3.28Brad King2023-10-171-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe8a5a6fbf Tests/NinjaPrivateDeps: fix error message for Build-PrivateFileSet-check Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8882
| * | | | | | | | Tests/NinjaPrivateDeps: fix error message for Build-PrivateFileSet-checkBen Boeckel2023-10-161-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | The file *should* exist, so word the error message as such.
* | | | | | | | Merge topic 'bootstrap-known-compilers' into release-3.28Brad King2023-10-161-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7662d50a1b bootstrap: update known compilers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8876
| * | | | | | | | bootstrap: update known compilersscivision2023-10-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | como: Comeau-not updated since 2008, unlikely to work with CMake icc: discontinued for icx icc: not for C++, put in 20 years ago, probably never used / worked
* | | | | | | | | Merge topic 'nvfortran-mipa' into release-3.28Brad King2023-10-161-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 44faa3773c PGI/NVHPC: Remove -Mipa compiler option for 23.3+ Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robertjmaynard@gmail.com> Merge-request: !8874
| * | | | | | | | | PGI/NVHPC: Remove -Mipa compiler option for 23.3+مهدي شينون (Mehdi Chinoune)2023-10-131-1/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `-Mipa` was removed since 23.3. The compiler warns about it: nvfortran-Warning-The option -Mipa has been deprecated and is ignored. See: https://docs.nvidia.com/hpc-sdk/archive/23.9/hpc-sdk-release-notes/index.html#deprecations
* | | | | | | | | Merge topic 'revert-autogen-exe-per-config' into release-3.28Brad King2023-10-1627-909/+204
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c074f5c81e Autogen: Revert "AUTO*_EXECUTABLE: add support for per-config values" 06a9b25b17 Tests: Revert "NinjaMultiConfig: Update tests for the new dependency change" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8878
| * | | | | | | | Autogen: Revert "AUTO*_EXECUTABLE: add support for per-config values"Orkun Tokdemir2023-10-1324-869/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing the `timestamp` file to `timestamp_$<CONFIG>` causes some user projects to break when using Qt versions older than 6.6. Revert commit fddd0f0443 (Autogen: AUTO*_EXECUTABLE: add support for per-config values, 2023-06-14, v3.28.0-rc1~96^2~1) pending further investigation. Issue: #20074
| * | | | | | | | Tests: Revert "NinjaMultiConfig: Update tests for the new dependency change"Orkun Tokdemir2023-10-133-40/+22
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit e454314daa (NinjaMultiConfig: Update tests for the new dependency change, 2023-07-05, v3.28.0-rc1~96^2) because we are about to revert the change for which it updated tests.
* | | | | | | | Merge branch 'release-3.27' into release-3.28Brad King2023-10-130-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'release-3.26' into release-3.27Brad King2023-10-120-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Merge branch 'backport-curl-socks5-fix' into release-3.26Brad King2023-10-121-4/+4
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !8872
| * | \ \ \ \ \ \ Merge branch 'backport-curl-socks5-fix' into release-3.27Brad King2023-10-121-4/+4
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | Merge-request: !8872
| | * | | | | | | curl: Backport SOCKS5 heap buffer overflow fix from curl 8.4.0Brad King2023-10-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport upstream curl commit `fb4415d8ae` (socks: return error if hostname too long for remote resolve, 2023-10-11, curl-8_4_0~2) to address CVE-2023-38545. Issue: #25329
* | | | | | | | | Merge topic 'update-curl' into release-3.28Brad King2023-10-13104-1587/+1651
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b298ba708a Utilities: Update hard-coded try_compile results for curl 8.4.0 8a9fa27a35 curl: Set build options the way we need for CMake df4efb72e4 Merge branch 'upstream-curl' into update-curl e6a6c1abc1 curl 2023-10-11 (d755a5f7) 8f6a6b02e5 curl: Update script to get curl 8.4.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8870
| * | | | | | | | Utilities: Update hard-coded try_compile results for curl 8.4.0Brad King2023-10-121-0/+1
| | | | | | | | |
| * | | | | | | | curl: Set build options the way we need for CMakeBrad King2023-10-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set options added by the update to curl 8.4.0.
| * | | | | | | | Merge branch 'upstream-curl' into update-curlBrad King2023-10-12102-1586/+1646
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2023-10-11 (d755a5f7) Issue: #25329
| | * | | | | | | | curl 2023-10-11 (d755a5f7)Curl Upstream2023-10-12102-1587/+1646
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit d755a5f7c009dd63a61b2c745180d8ba937cbfeb (curl-8_4_0).
| * | | | | | | | | curl: Update script to get curl 8.4.0Brad King2023-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #25329
* | | | | | | | | | Merge branch 'release-3.27' into release-3.28Brad King2023-10-120-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'release-3.26' into release-3.27Brad King2023-10-120-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | / / / / | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Merge branch 'backport-ctest_submit-follow-redirects' into release-3.26Brad King2023-10-121-0/+3
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !8873
| | | * | | | | | ctest: Restore support for http redirects during Submit stepZack Galbreath2023-10-121-0/+3
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After CDash PR 1519 introduced HTTP status codes greater than 200 for various error cases, CMake commit b7c871f745 (ctest: Update ctest_submit for CDash behavior change, 2023-07-24, v3.27.1~3^2) modified CTest's submit handler to check the status returned by CDash and throw an error when this status is not equal to 200. That change had the unintended side effect of causing CTest submissions to fail when uploading results to a URL that returns a redirect status code (3xx). Fix this by configuring cURL to follow the redirect. The status cURL reports to CTest is now 200 instead of 3xx when CDash is located behind a redirect. Fixes: #25159