[cmake-commits] king committed cmLocalGenerator.cxx 1.150 1.151
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Sep 25 10:22:51 EDT 2006
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv17678/Source
Modified Files:
cmLocalGenerator.cxx
Log Message:
BUG: Disable new shell escape code until backward compatibility can be established in the new implementation.
Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- cmLocalGenerator.cxx 21 Sep 2006 19:35:41 -0000 1.150
+++ cmLocalGenerator.cxx 25 Sep 2006 14:22:47 -0000 1.151
@@ -2246,6 +2246,20 @@
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 @@
result += *c;
}
}
+#endif
return result;
}
More information about the Cmake-commits
mailing list