Merge topic 'pch-fix-vs-test'

383bf3b5e7 Precompile Headers: Fix Visual Studio 10 unit test

Acked-by: Kitware Robot <[email protected]>
Merge-request: !3770

Tests/RunCMake/VS10Project/VsPrecompileHeaders-check.cmake

@@ -1,13 +1,11 @@
-set(pch_header "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/cmake_pch.hxx")
-set(pch_source "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/cmake_pch.cxx")
+set(pch_header "CMakeFiles/tgt.dir/cmake_pch.hxx")
+set(pch_source [=[CMakeFiles\\tgt.dir\\cmake_pch.cxx]=])
 
-file(TO_NATIVE_PATH "${pch_source}" pch_source_win)
-
-if(NOT EXISTS "${pch_header}")
+if(NOT EXISTS "${RunCMake_TEST_BINARY_DIR}/${pch_header}")
   set(RunCMake_TEST_FAILED "Generated PCH header ${pch_header} does not exist.")
   return()
 endif()
-if(NOT EXISTS "${pch_source}")
+if(NOT EXISTS "${RunCMake_TEST_BINARY_DIR}/${pch_source}")
   set(RunCMake_TEST_FAILED "Generated PCH header ${pch_source} does not exist.")
   return()
 endif()
@@ -29,16 +27,15 @@ foreach(line IN LISTS tgt_projects_strings)
     set(have_pch_create ON)
   endif()
 
-  if (line MATCHES "<PrecompiledHeaderFile.*>${pch_header}</PrecompiledHeaderFile>")
+  if (line MATCHES "<PrecompiledHeaderFile.*>.*${pch_header}</PrecompiledHeaderFile>")
     set(have_pch_header ON)
   endif()
 
-  if (line MATCHES "<ForcedIncludeFiles.*>${pch_header}</ForcedIncludeFiles>")
+  if (line MATCHES "<ForcedIncludeFiles.*>.*${pch_header}</ForcedIncludeFiles>")
     set(have_force_pch_header ON)
   endif()
 
-  string(FIND "${line}" "<ClCompile Include=\"${pch_source_win}\">" find_pos)
-  if (NOT find_pos EQUAL "-1")
+  if (line MATCHES "<ClCompile Include=.*${pch_source}\">")
     set(have_pch_source_compile ON)
   endif()
 endforeach()
@@ -64,6 +61,6 @@ if (NOT have_force_pch_header)
 endif()
 
 if (NOT have_pch_source_compile)
-  set(RunCMake_TEST_FAILED "Generated project should have the <ClCompile Include=\"${pch_source_win}\"> block.")
+  set(RunCMake_TEST_FAILED "Generated project should have the <ClCompile Include=\"${pch_source}\"> block.")
   return()
 endif()