diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2002-01-10 23:09:01 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2002-01-10 23:09:01 (GMT) |
| commit | 5e8f9427d1ac43ac04543bd6dd3b15251a1afe99 (patch) | |
| tree | 156ca95847cf3109c2f8109548edd374a76f83fd | |
| parent | 1793b70c56aec8747529976f031a87d7774c04af (diff) | |
| download | CMake-5e8f9427d1ac43ac04543bd6dd3b15251a1afe99.zip CMake-5e8f9427d1ac43ac04543bd6dd3b15251a1afe99.tar.gz CMake-5e8f9427d1ac43ac04543bd6dd3b15251a1afe99.tar.bz2 | |
BUG: fix build of library in other directory if it is not there
| -rw-r--r-- | Source/cmNMakeMakefileGenerator.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Source/cmNMakeMakefileGenerator.cxx b/Source/cmNMakeMakefileGenerator.cxx index 0685d82..247039a 100644 --- a/Source/cmNMakeMakefileGenerator.cxx +++ b/Source/cmNMakeMakefileGenerator.cxx @@ -723,12 +723,16 @@ void cmNMakeMakefileGenerator::OutputBuildLibraryInDir(std::ostream& fout, std::string currentDir = m_Makefile->GetCurrentOutputDirectory(); cmSystemTools::ConvertToWindowsSlashes(currentDir); - fout << cmSystemTools::EscapeSpaces(fullpath) - << ":\n\tcd " << cmSystemTools::EscapeSpaces(path) << "\n" + std::string wpath = cmSystemTools::EscapeSpaces(path); + cmSystemTools::ConvertToWindowsSlashes(wpath); + std::string wfullpath = cmSystemTools::EscapeSpaces(fullpath); + cmSystemTools::ConvertToWindowsSlashes(wfullpath); + fout << wfullpath + << ":\n\tcd " << wpath << "\n" << "\t$(MAKE) -$(MAKEFLAGS) $(MAKESILENT) cmake.depends\n" << "\t$(MAKE) -$(MAKEFLAGS) $(MAKESILENT) cmake.check_depends\n" << "\t$(MAKE) -$(MAKEFLAGS) $(MAKESILENT) -f cmake.check_depends\n" - << "\t$(MAKE) $(MAKESILENT) " << cmSystemTools::EscapeSpaces(fullpath) + << "\t$(MAKE) $(MAKESILENT) " << wfullpath << "\n\tcd " << cmSystemTools::EscapeSpaces(currentDir.c_str()) << "\n"; } |