From c1b4a0bf7468eccde909ccfd6ac4b18b813dc245 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Mon, 25 Sep 2006 10:22:48 -0400
Subject: [PATCH] BUG: Disable new shell escape code until backward
 compatibility can be established in the new implementation.

---
 Source/cmLocalGenerator.cxx        | 15 +++++++++++++++
 Tests/CustomCommand/CMakeLists.txt |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 66a78e1c7..34295aee3 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2246,6 +2246,20 @@ cmLocalGenerator
 std::string cmLocalGenerator::EscapeForShell(const char* str)
 {
   std::string result;
+  // Temporarily use old shell escaping code until a means of backward
+  // compatibility can be established in the new implementation.
+#if 1
+  bool forceOn =  cmSystemTools::GetForceUnixPaths();
+  if(forceOn && this->WindowsShell)
+    {
+    cmSystemTools::SetForceUnixPaths(false);
+    }
+  result = cmSystemTools::EscapeSpaces(str);
+  if(forceOn && this->WindowsShell)
+    {
+    cmSystemTools::SetForceUnixPaths(true);
+    }
+#else
   if(this->WindowsShell)
     {
     int size = cmsysSystem_Windows_ShellArgumentSize(str);
@@ -2264,5 +2278,6 @@ std::string cmLocalGenerator::EscapeForShell(const char* str)
       result += *c;
       }
     }
+#endif
   return result;
 }
diff --git a/Tests/CustomCommand/CMakeLists.txt b/Tests/CustomCommand/CMakeLists.txt
index 0fd1523bd..3af8540ee 100644
--- a/Tests/CustomCommand/CMakeLists.txt
+++ b/Tests/CustomCommand/CMakeLists.txt
@@ -199,7 +199,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/check_command_line.c.in
                @ONLY IMMEDIATE)
 ADD_EXECUTABLE(check_command_line
   ${CMAKE_CURRENT_BINARY_DIR}/check_command_line.c)
-ADD_CUSTOM_TARGET(do_check_command_line ALL
+ADD_CUSTOM_TARGET(do_check_command_line #ALL
   COMMAND ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/check_command_line
   ${CHECK_ARGS}
   )