diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2001-11-30 04:24:37 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2001-11-30 04:24:37 (GMT) |
| commit | c80c5d245d6a11182d308ebec62984bd3043d07c (patch) | |
| tree | 85fcf2216f61588ad89530d67051d4fc267ec0d5 /Source/cmUnixMakefileGenerator.cxx | |
| parent | f670003d24c8dacc5f1b6b9ee51ccf0db274a2c0 (diff) | |
| download | CMake-c80c5d245d6a11182d308ebec62984bd3043d07c.zip CMake-c80c5d245d6a11182d308ebec62984bd3043d07c.tar.gz CMake-c80c5d245d6a11182d308ebec62984bd3043d07c.tar.bz2 | |
ENH: fix various problems caused by the generalization of nmake generator
Diffstat (limited to 'Source/cmUnixMakefileGenerator.cxx')
| -rw-r--r-- | Source/cmUnixMakefileGenerator.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx index e100b7c..33842ec 100644 --- a/Source/cmUnixMakefileGenerator.cxx +++ b/Source/cmUnixMakefileGenerator.cxx @@ -235,12 +235,13 @@ void cmUnixMakefileGenerator::OutputMakefile(const char* file) for(std::vector<std::string>::const_iterator i = lfiles.begin(); i != lfiles.end(); ++i) { - fout << " " << cmSystemTools::EscapeSpaces(i->c_str()); + fout << " " << this->ConvertToNativePath(cmSystemTools::EscapeSpaces(i->c_str()).c_str()); } // Add the cache to the list std::string cacheFile = m_Makefile->GetHomeOutputDirectory(); cacheFile += "/CMakeCache.txt"; - fout << " " << cmSystemTools::EscapeSpaces(cacheFile.c_str()); + fout << " " << + this->ConvertToNativePath(cmSystemTools::EscapeSpaces(cacheFile.c_str()).c_str()); fout << "\n\n\n"; this->OutputMakeVariables(fout); // Set up the default target as the VERY first target, so that make with no arguments will run it @@ -309,21 +310,21 @@ void cmUnixMakefileGenerator::OutputTargetRules(std::ostream& fout) { path = path + l->first + m_StaticLibraryExtension; fout << " \\\n" - << cmSystemTools::EscapeSpaces(path.c_str()); + << this->ConvertToNativePath(cmSystemTools::EscapeSpaces(path.c_str()).c_str()); } else if(l->second.GetType() == cmTarget::SHARED_LIBRARY) { path = path + l->first + m_Makefile->GetDefinition("CMAKE_SHLIB_SUFFIX"); fout << " \\\n" - << cmSystemTools::EscapeSpaces(path.c_str()); + << this->ConvertToNativePath(cmSystemTools::EscapeSpaces(path.c_str()).c_str()); } else if(l->second.GetType() == cmTarget::MODULE_LIBRARY) { path = path + l->first + m_Makefile->GetDefinition("CMAKE_MODULE_SUFFIX"); fout << " \\\n" - << cmSystemTools::EscapeSpaces(path.c_str()); + << this->ConvertToNativePath(cmSystemTools::EscapeSpaces(path.c_str()).c_str()); } } } @@ -337,7 +338,7 @@ void cmUnixMakefileGenerator::OutputTargetRules(std::ostream& fout) { std::string path = m_ExecutableOutputPath + l->first + m_ExecutableExtension; - fout << " \\\n" << cmSystemTools::EscapeSpaces(path.c_str()); + fout << " \\\n" << this->ConvertToNativePath(cmSystemTools::EscapeSpaces(path.c_str()).c_str()); } } // list utilities last |