kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: closer to working with spaces in source directory

Browse Source
This commit is contained in:
Berk Geveci 2001-11-20 17:27:41 -05:00
parent a43f3c99c7
commit f3d63c1932
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmNMakeMakefileGenerator.cxx
View File

@ -98,18 +98,22 @@ void cmNMakeMakefileGenerator::OutputMakeVariables(std::ostream& fout)
std::string replaceVars = variables; std::string replaceVars = variables;
m_Makefile->ExpandVariablesInString(replaceVars); m_Makefile->ExpandVariablesInString(replaceVars);
fout << replaceVars.c_str(); fout << replaceVars.c_str();
fout << "CMAKE_CURRENT_SOURCE = " << m_Makefile->GetStartDirectory() fout << "CMAKE_CURRENT_SOURCE = " <<
cmSystemTools::EscapeSpaces(m_Makefile->GetStartDirectory() )
<< "\n"; << "\n";
fout << "CMAKE_CURRENT_BINARY = " << m_Makefile->GetStartOutputDirectory() fout << "CMAKE_CURRENT_BINARY = "
<< cmSystemTools::EscapeSpaces(m_Makefile->GetStartOutputDirectory())
<< "\n"; << "\n";
fout << "CMAKE_SOURCE_DIR = " << m_Makefile->GetHomeDirectory() << "\n"; fout << "CMAKE_SOURCE_DIR = " <<
fout << "CMAKE_BINARY_DIR = " << m_Makefile->GetHomeOutputDirectory() cmSystemTools::EscapeSpaces(m_Makefile->GetHomeDirectory()) << "\n";
fout << "CMAKE_BINARY_DIR = " <<
cmSystemTools::EscapeSpaces(m_Makefile->GetHomeOutputDirectory() )
<< "\n"; << "\n";
// Output Include paths // Output Include paths
fout << "INCLUDE_FLAGS = "; fout << "INCLUDE_FLAGS = ";
std::vector<std::string>& includes = m_Makefile->GetIncludeDirectories(); std::vector<std::string>& includes = m_Makefile->GetIncludeDirectories();
std::vector<std::string>::iterator i; std::vector<std::string>::iterator i;
fout << "-I" << m_Makefile->GetStartDirectory() << " "; fout << "-I" << cmSystemTools::EscapeSpaces(m_Makefile->GetStartDirectory()) << " ";
for(i = includes.begin(); i != includes.end(); ++i) for(i = includes.begin(); i != includes.end(); ++i)
{ {
std::string include = *i; std::string include = *i;
@ -179,6 +183,7 @@ void cmNMakeMakefileGenerator::OutputMakeRule(std::ostream& fout,
fout << "\n"; fout << "\n";
replace = target; replace = target;
m_Makefile->ExpandVariablesInString(replace); m_Makefile->ExpandVariablesInString(replace);
replace = cmSystemTools::EscapeSpaces(replace.c_str());
fout << replace.c_str() << ": "; fout << replace.c_str() << ": ";
if(depends) if(depends)
{ {