diff options
| author | Craig Scott <craig.scott@crascit.com> | 2019-11-12 13:28:34 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-11-12 13:28:46 (GMT) |
| commit | cba091d3a900d69961ef94a475c3ba1b0cb94453 (patch) | |
| tree | 999f1aa4a4eacc885196088f670865c754b7835f /Tests/RunCMake/PrecompileHeaders/PchPrologueEpilogue-check.cmake | |
| parent | 00f5e0206037ceec2d3c33569d1c845fdffa504f (diff) | |
| parent | e01935ac9d61e22be49f26910a76769585d7a257 (diff) | |
| download | CMake-cba091d3a900d69961ef94a475c3ba1b0cb94453.zip CMake-cba091d3a900d69961ef94a475c3ba1b0cb94453.tar.gz CMake-cba091d3a900d69961ef94a475c3ba1b0cb94453.tar.bz2 | |
Merge topic 'pch-no-duplicates' into release-3.16
e01935ac9d PCH: No repeated path for internal generated PCH files
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4030
Diffstat (limited to 'Tests/RunCMake/PrecompileHeaders/PchPrologueEpilogue-check.cmake')
| -rw-r--r-- | Tests/RunCMake/PrecompileHeaders/PchPrologueEpilogue-check.cmake | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Tests/RunCMake/PrecompileHeaders/PchPrologueEpilogue-check.cmake b/Tests/RunCMake/PrecompileHeaders/PchPrologueEpilogue-check.cmake index ba220f3..9018664 100644 --- a/Tests/RunCMake/PrecompileHeaders/PchPrologueEpilogue-check.cmake +++ b/Tests/RunCMake/PrecompileHeaders/PchPrologueEpilogue-check.cmake @@ -1,8 +1,4 @@ -if (NOT RunCMake_GENERATOR_IS_MULTI_CONFIG) - set(main_pch_header "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/main.dir/CMakeFiles/main.dir/cmake_pch.hxx") -else() - set(main_pch_header "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/main.dir/cmake_pch.hxx") -endif() +set(main_pch_header "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/main.dir/cmake_pch.hxx") file(STRINGS ${main_pch_header} main_pch_header_strings) string(REGEX MATCH "#pragma warning\\(push, 0\\).*#include.*pch.h.*#pragma warning\\(pop\\)" matched_code ${main_pch_header_strings}) |