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

-make paths with spaces work in the CodeBlocks generator with MinGW (#10014) 

Alex
This commit is contained in:
Alexander Neundorf 2010-01-24 15:11:58 -05:00
parent 0999bd7fb8
commit 5f540dcbf3
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmExtraCodeBlocksGenerator.cxx
View File

@ -545,7 +545,6 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
{ {
std::string makefileName = makefile->GetStartOutputDirectory(); std::string makefileName = makefile->GetStartOutputDirectory();
makefileName += "/Makefile"; makefileName += "/Makefile";
makefileName = cmSystemTools::ConvertToOutputPath(makefileName.c_str());
fout<<" <Target title=\"" << targetName << "\">\n"; fout<<" <Target title=\"" << targetName << "\">\n";
if (target!=0) if (target!=0)
@ -696,22 +695,27 @@ std::string cmExtraCodeBlocksGenerator::BuildMakeCommand(
std::string command = make; std::string command = make;
if (strcmp(this->GlobalGenerator->GetName(), "NMake Makefiles")==0) if (strcmp(this->GlobalGenerator->GetName(), "NMake Makefiles")==0)
{ {
std::string makefileName = cmSystemTools::ConvertToOutputPath(makefile);
command += " /NOLOGO /f &quot;"; command += " /NOLOGO /f &quot;";
command += makefile; command += makefileName;
command += "&quot; "; command += "&quot; ";
command += target; command += target;
} }
else if (strcmp(this->GlobalGenerator->GetName(), "MinGW Makefiles")==0) else if (strcmp(this->GlobalGenerator->GetName(), "MinGW Makefiles")==0)
{ {
command += " -f "; // no escaping of spaces in this case, see
command += makefile; // http://public.kitware.com/Bug/view.php?id=10014
command += " "; std::string makefileName = makefile;
command += " -f &quot;";
command += makefileName;
command += "&quot; ";
command += target; command += target;
} }
else else
{ {
std::string makefileName = cmSystemTools::ConvertToOutputPath(makefile);
command += " -f &quot;"; command += " -f &quot;";
command += makefile; command += makefileName;
command += "&quot; "; command += "&quot; ";
command += target; command += target;
} }