diff options
| author | Brad King <brad.king@kitware.com> | 2024-02-02 13:23:31 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-02-02 14:43:15 (GMT) |
| commit | 87bf1c6c33fd774587cd3644ffb8d665111cbb50 (patch) | |
| tree | 7b9d7f7ee4bc108da3a39068df11ee9f8dbac39c /Tests/RunCMake | |
| parent | 817e309af535dd9f58e1d0248ffb0b7cefc4cb49 (diff) | |
| parent | df08c37a42379cc73dc2dd610a5b87573b24d12e (diff) | |
| download | CMake-87bf1c6c33fd774587cd3644ffb8d665111cbb50.zip CMake-87bf1c6c33fd774587cd3644ffb8d665111cbb50.tar.gz CMake-87bf1c6c33fd774587cd3644ffb8d665111cbb50.tar.bz2 | |
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
Diffstat (limited to 'Tests/RunCMake')
3 files changed, 4 insertions, 0 deletions
diff --git a/Tests/RunCMake/PrecompileHeaders/PchInterfaceUnity-check.cmake b/Tests/RunCMake/PrecompileHeaders/PchInterfaceUnity-check.cmake new file mode 100644 index 0000000..c17aaa0 --- /dev/null +++ b/Tests/RunCMake/PrecompileHeaders/PchInterfaceUnity-check.cmake @@ -0,0 +1 @@ +include(${CMAKE_CURRENT_LIST_DIR}/PchInterface-check.cmake) diff --git a/Tests/RunCMake/PrecompileHeaders/PchInterfaceUnity.cmake b/Tests/RunCMake/PrecompileHeaders/PchInterfaceUnity.cmake new file mode 100644 index 0000000..59c2523 --- /dev/null +++ b/Tests/RunCMake/PrecompileHeaders/PchInterfaceUnity.cmake @@ -0,0 +1,2 @@ +set(CMAKE_UNITY_BUILD 1) +include(PchInterface.cmake) diff --git a/Tests/RunCMake/PrecompileHeaders/RunCMakeTest.cmake b/Tests/RunCMake/PrecompileHeaders/RunCMakeTest.cmake index b163369..c8a5c15 100644 --- a/Tests/RunCMake/PrecompileHeaders/RunCMakeTest.cmake +++ b/Tests/RunCMake/PrecompileHeaders/RunCMakeTest.cmake @@ -12,6 +12,7 @@ endfunction() run_cmake(DisabledPch) run_cmake(PchDebugGenex) run_test(PchInterface) +run_test(PchInterfaceUnity) run_cmake(PchPrologueEpilogue) run_test(SkipPrecompileHeaders) run_test(CXXnotC) |