diff options
| author | Ken Martin <ken.martin@kitware.com> | 2007-02-19 19:25:45 (GMT) |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2007-02-19 19:25:45 (GMT) |
| commit | e7ab8a0e1d7be7a3fde17f76d180a255ba44f7f1 (patch) | |
| tree | b69a2c0a8bfe37353022a8fbde8ecedc52d0c509 /Source | |
| parent | a7042f2e970e2f881b6b2c283592e770f6d1b4c9 (diff) | |
| download | CMake-e7ab8a0e1d7be7a3fde17f76d180a255ba44f7f1.zip CMake-e7ab8a0e1d7be7a3fde17f76d180a255ba44f7f1.tar.gz CMake-e7ab8a0e1d7be7a3fde17f76d180a255ba44f7f1.tar.bz2 | |
ENH: fixed more bugs with spaces in the path
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 3 | ||||
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 815fe29..affcf52 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -421,6 +421,7 @@ void cmLocalUnixMakefileGenerator3 // 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 @@ cmLocalUnixMakefileGenerator3 // 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. diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 6330124..19ecb7c 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -490,7 +490,11 @@ cmMakefileTargetGenerator 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, |