From 5e8f9427d1ac43ac04543bd6dd3b15251a1afe99 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Thu, 10 Jan 2002 18:09:01 -0500 Subject: [PATCH] BUG: fix build of library in other directory if it is not there --- Source/cmNMakeMakefileGenerator.cxx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Source/cmNMakeMakefileGenerator.cxx b/Source/cmNMakeMakefileGenerator.cxx index 0685d824d..247039a4d 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"; }