diff options
| author | Nils Gladitz <nilsgladitz@gmail.com> | 2014-01-13 22:15:26 (GMT) |
|---|---|---|
| committer | Nils Gladitz <nilsgladitz@gmail.com> | 2014-01-13 22:15:26 (GMT) |
| commit | f2b47197dc91db01e5d21536a6d1d9e85f3c72b5 (patch) | |
| tree | 3ad34db1f345507522d16f49bdac7ab713c27f2a /Source | |
| parent | 071005add14f426c9326c2fba8771da1e563ac92 (diff) | |
| download | CMake-f2b47197dc91db01e5d21536a6d1d9e85f3c72b5.zip CMake-f2b47197dc91db01e5d21536a6d1d9e85f3c72b5.tar.gz CMake-f2b47197dc91db01e5d21536a6d1d9e85f3c72b5.tar.bz2 | |
CodeBlocks: fix unescaped command quotes when used with nmake
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmExtraCodeBlocksGenerator.cxx | 8 |
1 files 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; } |