diff options
| author | Brad King <brad.king@kitware.com> | 2014-01-14 13:56:05 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-01-14 13:56:05 (GMT) |
| commit | d5639044d39c288a61f079e176e98ae41280b01e (patch) | |
| tree | 34812919bd012148977c1968c111f98e65632b5e /Source | |
| parent | 6389da7905258619f9149d754b40baa0a54fc704 (diff) | |
| parent | f2b47197dc91db01e5d21536a6d1d9e85f3c72b5 (diff) | |
| download | CMake-d5639044d39c288a61f079e176e98ae41280b01e.zip CMake-d5639044d39c288a61f079e176e98ae41280b01e.tar.gz CMake-d5639044d39c288a61f079e176e98ae41280b01e.tar.bz2 | |
Merge topic 'fix-cb-nmake-quotes'
f2b47197 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; } |