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

Merge topic 'fix-cb-nmake-quotes' 

f2b47197 CodeBlocks: fix unescaped command quotes when used with nmake
This commit is contained in:
Brad King 2014-01-14 08:56:05 -05:00 committed by CMake Topic Stage
parent 6389da7905 f2b47197dc
commit d5639044d3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmExtraCodeBlocksGenerator.cxx
View File

@ -761,10 +761,12 @@ std::string cmExtraCodeBlocksGenerator::BuildMakeCommand(
std::string command = make;
if (strcmp(this->GlobalGenerator->GetName(), "NMake Makefiles")==0)
{
// For Windows ConvertToOutputPath already adds quotes when required.
// These need to be escaped, see
// http://public.kitware.com/Bug/view.php?id=13952
std::string makefileName = cmSystemTools::ConvertToOutputPath(makefile);
command += " /NOLOGO /f "";
command += makefileName;
command += "" ";
command += " /NOLOGO /f ";
command += cmXMLSafe(makefileName).str();
command += " VERBOSE=1 ";
command += target;
}