Merge topic 'msvc-wine-showIncludes'

fb3c4715cd Ninja: Restore detection of msvc-wine showIncludes prefix

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

Modules/CMakeDetermineCompilerId.cmake

@@ -1149,7 +1149,7 @@ function(CMAKE_DETERMINE_MSVC_SHOWINCLUDES_PREFIX lang userflags)
     ENCODING AUTO # cl prints in console output code page
     )
   string(REPLACE "\n" "\n  " msg "  ${out}")
-  if(res EQUAL 0 AND "${out}" MATCHES "(^|\n)([^:\n][^:\n]+:[^:\n]*[^: \n][^: \n]:?[ \t]+)([A-Za-z]:\\\\|\\./)")
+  if(res EQUAL 0 AND "${out}" MATCHES "(^|\n)([^:\n][^:\n]+:[^:\n]*[^: \n][^: \n]:?[ \t]+)([A-Za-z]:\\\\|\\./|/)")
     set(CMAKE_${lang}_CL_SHOWINCLUDES_PREFIX "${CMAKE_MATCH_2}" PARENT_SCOPE)
     string(APPEND msg "\nFound prefix \"${CMAKE_MATCH_2}\"")
   else()

Tests/RunCMake/Ninja/RunCMakeTest.cmake

@@ -51,6 +51,7 @@ if(WIN32)
   run_cmake_script(ShowIncludes-437-French -DshowIncludes=${showIncludes} ${maybe_MAKE_PROGRAM})
   run_cmake_script(ShowIncludes-437-German -DshowIncludes=${showIncludes} ${maybe_MAKE_PROGRAM})
   run_cmake_script(ShowIncludes-437-Italian -DshowIncludes=${showIncludes} ${maybe_MAKE_PROGRAM})
+  run_cmake_script(ShowIncludes-437-WineMSVC -DshowIncludes=${showIncludes} ${maybe_MAKE_PROGRAM})
   run_cmake_script(ShowIncludes-54936-Chinese -DshowIncludes=${showIncludes} ${maybe_MAKE_PROGRAM})
   run_cmake_script(ShowIncludes-65001-Chinese -DshowIncludes=${showIncludes} ${maybe_MAKE_PROGRAM})
   run_cmake_script(ShowIncludes-65001-French -DshowIncludes=${showIncludes} ${maybe_MAKE_PROGRAM})

Tests/RunCMake/Ninja/ShowIncludes-437-WineMSVC-check.cmake

@@ -0,0 +1,3 @@
+# 'msvc-wine -showIncludes' prefix.
+set(expect "Note: including file: ")
+include(${CMAKE_CURRENT_LIST_DIR}/ShowIncludes-check.cmake)

Tests/RunCMake/Ninja/ShowIncludes-437-WineMSVC-stdout.txt

@@ -0,0 +1 @@
+-- showIncludes='Note: including file: '

Tests/RunCMake/Ninja/ShowIncludes-437-WineMSVC.cmake

@@ -0,0 +1,3 @@
+set(CODEPAGE 437)
+set(VSLANG "msvc-wine") # Special case for test, not a real VS value.
+include(${CMAKE_CURRENT_LIST_DIR}/ShowIncludes.cmake)

Tests/RunCMake/showIncludes.c

@@ -36,6 +36,14 @@ int main()
     }
   }
 
+  // msvc-wine (special case for test, not a real VS value).
+  if (strcmp(vslang, "msvc-wine") == 0) {
+    if (cp == 437 || cp == 65001) {
+      printf("Note: including file: /c/foo.h\n");
+      return 0;
+    }
+  }
+
   // German.
   if (strcmp(vslang, "1031") == 0) {
     if (cp == 437 || cp == 65001) {