[cmake-commits] hoffman committed cmLocalUnixMakefileGenerator3.cxx 1.190 1.191

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Feb 27 13:34:14 EST 2007


Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv11789

Modified Files:
	cmLocalUnixMakefileGenerator3.cxx 
Log Message:
ENH: add a fix for spaces in the path again...


Index: cmLocalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalUnixMakefileGenerator3.cxx,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -d -r1.190 -r1.191
--- cmLocalUnixMakefileGenerator3.cxx	27 Feb 2007 17:10:42 -0000	1.190
+++ cmLocalUnixMakefileGenerator3.cxx	27 Feb 2007 18:34:12 -0000	1.191
@@ -1766,8 +1766,15 @@
   if (tgt && tgt[0] != '\0')
     {
     std::string tgt2 = this->Convert(tgt,HOME_OUTPUT,MAKEFILE);
-    tgt2 = this->ConvertToMakeTarget(tgt2.c_str());
-    tgt2 = this->EscapeForShell(tgt2.c_str());
+    tgt2 = this->ConvertToMakeTarget(tgt2.c_str()); 
+    bool forceOn =  cmSystemTools::GetForceUnixPaths();
+#if !defined(WIN32) || defined(CYGWIN)
+    forceOn = true;
+#endif 
+    if(forceOn )
+      {
+      tgt2 = cmSystemTools::EscapeForUnixShell(tgt2);
+      }
     cmd += tgt2;
     }
   return cmd;



More information about the Cmake-commits mailing list