summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs-CLRSupport'Brad King2022-10-3114-9/+175
|\ | | | | | | | | | | | | | | eef13a4b33 VS: Add COMMON_LANGUAGE_RUNTIME support for "netcore" 0815329dbc Help: Format COMMON_LANGUAGE_RUNTIME values as a definition list Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7807
| * VS: Add COMMON_LANGUAGE_RUNTIME support for "netcore"ζeh Matt2022-10-2814-4/+160
| | | | | | | | | | | | Generate `CLRSupport` for Visual Studio projects. Fixes: #22054
| * Help: Format COMMON_LANGUAGE_RUNTIME values as a definition listBrad King2022-10-281-5/+15
| |
* | Merge branch 'release-3.25'Brad King2022-10-310-0/+0
|\ \
| * \ Merge topic 'file-download-log-with-hash' into release-3.25Brad King2022-10-311-5/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | d78671879b file(DOWNLOAD): Fix LOG with EXPECTED_HASH on download failure Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7848
* | \ \ Merge topic 'file-download-log-with-hash'Brad King2022-10-311-5/+7
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | d78671879b file(DOWNLOAD): Fix LOG with EXPECTED_HASH on download failure Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7848
| * | | file(DOWNLOAD): Fix LOG with EXPECTED_HASH on download failureAurelien Regat-Barrel2022-10-301-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `file(DOWNLOAD <url> EXPECTED_HASH <hash> LOG <logs>)` fails to download the requested file, the hash check will also fail and make the command exit without actually returning the curl logs as requested by the `LOG` argument. Report the log before checking the hash. Issue: #24093
* | | | Merge branch 'release-3.25'Brad King2022-10-310-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'ArchLinux-lib-dir' into release-3.25Brad King2022-10-311-3/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 988b9928e4 Linux: Avoid finding libraries using lib64 on ArchLinux Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Felix Yan <felixonmars@archlinux.org> Merge-request: !7849
* | \ \ \ Merge topic 'ArchLinux-lib-dir'Brad King2022-10-311-3/+8
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 988b9928e4 Linux: Avoid finding libraries using lib64 on ArchLinux Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Felix Yan <felixonmars@archlinux.org> Merge-request: !7849
| * | | | Linux: Avoid finding libraries using lib64 on ArchLinuxLetu Ren2022-10-301-3/+8
| | |/ / | |/| | | | | | | | | | | | | | ArchLinux uses `/lib` for 64-bit libraries and there is no `/lib64`. However, unlike Debian, 32-bit libraries are in `/lib32`.
* | | | Merge branch 'release-3.25'Brad King2022-10-310-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'vs-dotnetsdk-arm64' into release-3.25Brad King2022-10-311-2/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a0ca7df67 Tests: Fix RunCMake.VsDotnetSdk with VS >= 17.3 on ARM64 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7842
* | \ \ \ Merge topic 'vs-dotnetsdk-arm64'Brad King2022-10-311-2/+8
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 9a0ca7df67 Tests: Fix RunCMake.VsDotnetSdk with VS >= 17.3 on ARM64 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7842
| * | | | Tests: Fix RunCMake.VsDotnetSdk with VS >= 17.3 on ARM64Anthony Roberts2022-10-281-2/+8
| | |/ / | |/| | | | | | | | | | | | | | VS 17.3 provides an arm64-native version of the tool, but the test was looking for the x64 version.
* | | | Merge branch 'release-3.25'Brad King2022-10-310-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'ninja-showIncludes-encoding' into release-3.25Brad King2022-10-3118-35/+128
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a0d4e3bf34 cmGeneratedFileStream: Drop unused WriteRaw method 2e5af30ce0 Ninja: Match showIncludes dependencies using console output code page e1c1679148 cm_codecvt: Add support for the Windows console output code page 328c15189d cmGeneratedFileStream: Add support for a temporary alternate encoding Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7845
* | \ \ \ Merge topic 'ninja-showIncludes-encoding'Brad King2022-10-3118-35/+128
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a0d4e3bf34 cmGeneratedFileStream: Drop unused WriteRaw method 2e5af30ce0 Ninja: Match showIncludes dependencies using console output code page e1c1679148 cm_codecvt: Add support for the Windows console output code page 328c15189d cmGeneratedFileStream: Add support for a temporary alternate encoding Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7845
| * | | | cmGeneratedFileStream: Drop unused WriteRaw methodBrad King2022-10-302-23/+1
| | | | | | | | | | | | | | | | | | | | It has been superseded by `WriteAltEncoding`.
| * | | | Ninja: Match showIncludes dependencies using console output code pageBrad King2022-10-3014-22/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generalize the fix from commit 37a279f8d1 (Ninja: Write msvc_deps_prefix as UTF-8 when console codepage is UTF-8, 2020-07-31, v3.19.0-rc1~349^2). `cl /showIncludes` output is encoded using the console output code page, so this is the byte sequence that Ninja must use to match its lines. Fixes: #24068
| * | | | cm_codecvt: Add support for the Windows console output code pageBrad King2022-10-292-1/+8
| | | | | | | | | | | | | | | | | | | | This is distinct from the Windows ANSI code page.
| * | | | cmGeneratedFileStream: Add support for a temporary alternate encodingBrad King2022-10-292-0/+20
| | |/ / | |/| | | | | | | | | | | | | | The Ninja generator needs to be able to write some file content in a different encoding than the rest of the file. Add a method to do this.
* | | | Merge branch 'release-3.25'Brad King2022-10-310-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'xcode-obj-dir' into release-3.25Brad King2022-10-319-16/+44
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 024e3d2bf6 Xcode: Put object files in a place that Xcode cleans Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7843
* | | | Merge topic 'xcode-obj-dir'Brad King2022-10-319-16/+44
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 024e3d2bf6 Xcode: Put object files in a place that Xcode cleans Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7843
| * | | Xcode: Put object files in a place that Xcode cleansBrad King2022-10-289-16/+44
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Since commit dc5fc898f6 (Xcode: Set object file locations using TARGET_TEMP_DIR, 2022-09-29, v3.25.0-rc1~64^2~1), `xcodebuild clean` does not remove the object files in our explicit `TARGET_TEMP_DIR` because it is not under the `SYMROOT`. Put it there. Fixes: #24096
* | | CMake Nightly Date StampKitware Robot2022-10-311-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2022-10-301-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2022-10-291-1/+1
| |/ |/|
* | Merge topic 'clang-tidy-module-script-fixes'Brad King2022-10-281-1/+2
|\ \ | | | | | | | | | | | | | | | | | | 18d2bd71af clang-tidy module: build as release, output on test failure Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7834
| * | clang-tidy module: build as release, output on test failureKyle Edwards2022-10-261-1/+2
| | | | | | | | | | | | | | | Build the module with -DCMAKE_BUILD_TYPE=Release, and run ctest with --output-on-failure.
* | | Merge topic 'timestamp-timezone'Brad King2022-10-288-7/+105
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9da542d5c1 string(TIMESTAMP): Add %z and %Z for adding time zone string Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7788
| * | | string(TIMESTAMP): Add %z and %Z for adding time zone stringVasiliy Koyrev2022-10-278-7/+105
| | | | | | | | | | | | | | | | Fixes: #24056
* | | | Merge topic 'extended-profiling'Brad King2022-10-285-21/+106
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0fe7aae91f cmake: Add profiling events for configure and generate 3d6a8d7eac cmMakefileProfilingData: Refactor to use RAII Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7828
| * | | | cmake: Add profiling events for configure and generateKyle Edwards2022-10-272-1/+10
| | | | |
| * | | | cmMakefileProfilingData: Refactor to use RAIIKyle Edwards2022-10-264-21/+97
| | |/ / | |/| | | | | | | | | | And add a more generic StartEntry() method.
* | | | Merge topic 'tutorial_step7_update'Brad King2022-10-283-25/+158
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f9ef15f3dc Tutorial: Update step 7 style Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7787
| * | | | Tutorial: Update step 7 styleMarkus Ferrell2022-10-273-25/+158
| | |/ / | |/| |
* | | | Merge topic 'tutorial_step5_cleanup'Brad King2022-10-281-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 43f87741f4 Tutorial: Fix Step 5 solution after update to Step 6 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7838
| * | | | Tutorial: Fix Step 5 solution after update to Step 6Markus Ferrell2022-10-271-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | Since commit 6e58a01f4e (Tutorial: Update step 6 style, 2022-10-06) the `literalinclude` included an extra comment from step 6 instructions. Fix the include bounds to remove the extra text.
* | | | Merge branch 'release-3.25'Brad King2022-10-280-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge topic 'FindGLUT-pkg-config' into release-3.25Brad King2022-10-281-3/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 919ab832e8 FindGLUT: Fix regression when pkg-config is not available Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7840
* | \ \ \ Merge topic 'FindGLUT-pkg-config'Brad King2022-10-281-3/+5
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 919ab832e8 FindGLUT: Fix regression when pkg-config is not available Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7840
| * | | | FindGLUT: Fix regression when pkg-config is not availableBrad King2022-10-271-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit a2fc4b6257 (FindGLUT: Drop the now-unnecessary exclusion of pkg-config for multiconfig, 2022-10-13, v3.25.0-rc2~16^2) we accidentally removed the entire condition around the `pkg-config` code path instead of just the multi-config part. Fixes: #24095
* | | | | Merge branch 'release-3.25'Brad King2022-10-280-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'vs-dotnet-sdk-output-paths' into release-3.25Brad King2022-10-281-1/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2d1be0671 VS: Fix paths in multi-target SDK-style projects Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7836
* | \ \ \ \ Merge topic 'vs-dotnet-sdk-output-paths'Brad King2022-10-281-1/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | d2d1be0671 VS: Fix paths in multi-target SDK-style projects Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7836
| * | | | | VS: Fix paths in multi-target SDK-style projectsSebastian Maisch2022-10-271-1/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the `AppendTargetFrameworkToOutputPath` property to `false` only for single target SDK-style projects. This prevents outputs from being overwritten during the build. This revises commit 7671d71299 (VS: Fix target output paths in SDK-style projects, 2022-09-23, v3.25.0-rc1~82^2). Fixes: #24094 Issue: #23989
* | | | | Merge branch 'release-3.25'Brad King2022-10-280-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'xcode-restore-install-path' into release-3.25Brad King2022-10-281-3/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d5631f0d0 Xcode: Revert "Don't set INSTALL_PATH unless target is SHARED_LIBRARY" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7839
generated by cgit v0.12 at 2025-09-08 05:04:30 (GMT)