From f2b47197dc91db01e5d21536a6d1d9e85f3c72b5 Mon Sep 17 00:00:00 2001 From: Nils Gladitz Date: Mon, 13 Jan 2014 23:15:26 +0100 Subject: CodeBlocks: fix unescaped command quotes when used with nmake --- Source/cmExtraCodeBlocksGenerator.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx index a066153..548c88b 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -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; } -- cgit v0.12