| commit | 87bf1c6c33fd774587cd3644ffb8d665111cbb50 | [log] [tgz] |
|---|---|---|
| author | Brad King <brad.king@kitware.com> | Fri Feb 02 08:23:31 2024 -0500 |
| committer | Brad King <brad.king@kitware.com> | Fri Feb 02 09:43:15 2024 -0500 |
| tree | 7b9d7f7ee4bc108da3a39068df11ee9f8dbac39c | |
| parent | 817e309af535dd9f58e1d0248ffb0b7cefc4cb49 [diff] | |
| parent | df08c37a42379cc73dc2dd610a5b87573b24d12e [diff] |
Merge branch 'unity-after-compile-features' into restore-pch-with-unity Replace commit 76b5383123 (cmGlobalGenerator: add unity sources after computing target compile features, 2024-01-01, v3.28.2~17^2~1) with an alternative change. This merge commit resolves conflicts such that future `git blame` calls will follow the second parent for the relevant lines and pretend the replaced commit never existed. Fixes: #25650
