From dd87d25845adff340845e1eddcc083f0534a5c89 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Fri, 8 Aug 2025 15:32:08 -0400 Subject: [PATCH] Tests/PrecompileHeaders: fix generator-specific pch path expectations --- .../PrecompileHeaders/PchDebugGenexShort-check.cmake | 8 +++++++- .../PrecompileHeaders/PchInterfaceShort-check.cmake | 10 ++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Tests/RunCMake/PrecompileHeaders/PchDebugGenexShort-check.cmake b/Tests/RunCMake/PrecompileHeaders/PchDebugGenexShort-check.cmake index 20da8e4122..e821472bfc 100644 --- a/Tests/RunCMake/PrecompileHeaders/PchDebugGenexShort-check.cmake +++ b/Tests/RunCMake/PrecompileHeaders/PchDebugGenexShort-check.cmake @@ -2,7 +2,13 @@ if (NOT RunCMake_GENERATOR_IS_MULTI_CONFIG) return() endif() -set(foo_pch_header "${RunCMake_TEST_BINARY_DIR}/.o/4bcad702/Debug/cmake_pch.h") +set(subdir ".o") +if (RunCMake_GENERATOR MATCHES "Visual Studio") + set(subdir "CMakeFiles") +elseif (RunCMake_GENERATOR MATCHES "(Borland Makefiles|Watcom WMake)") + set(subdir "_o") +endif () +set(foo_pch_header "${RunCMake_TEST_BINARY_DIR}/${subdir}/4bcad702/Debug/cmake_pch.h") if (NOT EXISTS ${foo_pch_header}) set(RunCMake_TEST_FAILED "Generated foo pch header ${foo_pch_header} does not exist") diff --git a/Tests/RunCMake/PrecompileHeaders/PchInterfaceShort-check.cmake b/Tests/RunCMake/PrecompileHeaders/PchInterfaceShort-check.cmake index 7f8e8b7adf..b139b02259 100644 --- a/Tests/RunCMake/PrecompileHeaders/PchInterfaceShort-check.cmake +++ b/Tests/RunCMake/PrecompileHeaders/PchInterfaceShort-check.cmake @@ -1,6 +1,12 @@ -set(foobar_pch_header "${RunCMake_TEST_BINARY_DIR}/.o/ff32d702/cmake_pch.h") +set(subdir ".o") +if (RunCMake_GENERATOR MATCHES "Visual Studio") + set(subdir "CMakeFiles") +elseif (RunCMake_GENERATOR MATCHES "(Borland Makefiles|Watcom WMake)") + set(subdir "_o") +endif () +set(foobar_pch_header "${RunCMake_TEST_BINARY_DIR}/${subdir}/ff32d702/cmake_pch.h") if (RunCMake_GENERATOR_IS_MULTI_CONFIG) - set(foobar_pch_header "${RunCMake_TEST_BINARY_DIR}/.o/ff32d702/Debug/cmake_pch.h") + set(foobar_pch_header "${RunCMake_TEST_BINARY_DIR}/${subdir}/ff32d702/Debug/cmake_pch.h") endif() if (NOT EXISTS ${foobar_pch_header})