diff options
author | Ken Martin <ken.martin@kitware.com> | 2005-05-31 15:46:49 (GMT) |
---|---|---|
committer | Ken Martin <ken.martin@kitware.com> | 2005-05-31 15:46:49 (GMT) |
commit | 6999000852718d6d37b6bfaac3d0dbf6365846cb (patch) | |
tree | 14ad125702e61deea255820b17b6a671f9325f9a /Source/cmLocalUnixMakefileGenerator3.cxx | |
parent | f79376c1d1211b60f2440a137ed0eeec2dc32677 (diff) | |
download | CMake-6999000852718d6d37b6bfaac3d0dbf6365846cb.zip CMake-6999000852718d6d37b6bfaac3d0dbf6365846cb.tar.gz CMake-6999000852718d6d37b6bfaac3d0dbf6365846cb.tar.bz2 |
ENH: now uses Makefile2 to cleanup zsh issues and provided some more documentation
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
-rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 2f62478..7211b24 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -2782,11 +2782,13 @@ void cmLocalUnixMakefileGenerator3::CreateJumpCommand(std::vector<std::string>& // back because the shell keeps the working directory between // commands. std::string cmd = "cd "; - cmd += this->ConvertToOutputForExisting(m_Makefile->GetHomeOutputDirectory()); + cmd += this->ConvertToOutputForExisting + (m_Makefile->GetHomeOutputDirectory()); commands.push_back(cmd); // Build the target for this pass. - commands.push_back(this->GetRecursiveMakeCall("Makefile",localName.c_str())); + commands.push_back(this->GetRecursiveMakeCall + ("Makefile2",localName.c_str())); // Change back to the starting directory. Any trailing slash must be // removed to avoid problems with Borland Make. @@ -2811,7 +2813,7 @@ void cmLocalUnixMakefileGenerator3::CreateJumpCommand(std::vector<std::string>& // Build the target for this pass. cmd += " && "; - cmd += this->GetRecursiveMakeCall("Makefile",localName.c_str()); + cmd += this->GetRecursiveMakeCall("Makefile2",localName.c_str()); // Add the command as a single line. commands.push_back(cmd); |