[cmake-commits] martink committed cmLocalUnixMakefileGenerator3.cxx 1.187 1.188 cmMakefileTargetGenerator.cxx 1.53 1.54

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Feb 19 14:25:47 EST 2007


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

Modified Files:
	cmLocalUnixMakefileGenerator3.cxx 
	cmMakefileTargetGenerator.cxx 
Log Message:
ENH: fixed more bugs with spaces in the path


Index: cmLocalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalUnixMakefileGenerator3.cxx,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -d -r1.187 -r1.188
--- cmLocalUnixMakefileGenerator3.cxx	19 Feb 2007 17:26:32 -0000	1.187
+++ cmLocalUnixMakefileGenerator3.cxx	19 Feb 2007 19:25:45 -0000	1.188
@@ -421,6 +421,7 @@
       // Add a fast rule to build the target
       std::string makefileName = this->GetRelativeTargetDirectory(t->second);
       makefileName += "/build.make";
+      // make sure the makefile name is suitable for a makefile
       std::string makeTargetName = 
         this->GetRelativeTargetDirectory(t->second);
       makeTargetName += "/build";
@@ -1742,7 +1743,7 @@
   // Call make on the given file.
   std::string cmd;
   cmd += "$(MAKE) -f ";
-  cmd += makefile;
+  cmd += this->Convert(makefile,NONE,MAKEFILE);
   cmd += " ";
   
   // Passg down verbosity level.

Index: cmMakefileTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileTargetGenerator.cxx,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- cmMakefileTargetGenerator.cxx	19 Feb 2007 17:25:56 -0000	1.53
+++ cmMakefileTargetGenerator.cxx	19 Feb 2007 19:25:45 -0000	1.54
@@ -490,7 +490,11 @@
   vars.Language = lang;
   vars.TargetPDB = targetOutPathPDB.c_str();
   vars.Source = sourceFile.c_str();
-  vars.Object = relativeObj.c_str();
+  std::string shellrelativeObj = 
+    this->Convert(relativeObj.c_str(), 
+                  cmLocalGenerator::NONE, 
+                  cmLocalGenerator::SHELL).c_str();
+  vars.Object = shellrelativeObj.c_str();
   std::string objdir = this->LocalGenerator->GetHomeRelativeOutputPath();
   objdir = this->Convert(objdir.c_str(),
                          cmLocalGenerator::START_OUTPUT,



More information about the Cmake-commits mailing list