mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-22 06:59:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

ENH: Added testing for custom command line arguments containing all special characters on the US keyboard. Fixed curly brace arguments on borland and % arguments in mingw32-make.

Browse Source
This commit is contained in:
Brad King
2007-05-17 10:53:18 -04:00
parent cc507411d3
commit c25d2bfdd2
7 changed files with 112 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@@ -55,6 +55,7 @@ cmLocalUnixMakefileGenerator3::cmLocalUnixMakefileGenerator3()
this->NativeEchoWindows = true;
this->MakeCommandEscapeTargetTwice = false;
this->IsMakefileGenerator = true;
this->BorlandMakeCurlyHack = false;
}
//----------------------------------------------------------------------------
@@ -939,6 +940,27 @@ cmLocalUnixMakefileGenerator3
escapeAllowMakeVars);
}
}
if(this->BorlandMakeCurlyHack)
{
// Borland Make has a very strange bug. If the first curly
// brace anywhere in the command string is a left curly, it
// must be written {{} instead of just {. Otherwise some
// curly braces are removed. The hack can be skipped if the
// first curly brace is the last character.
std::string::size_type lcurly = cmd.find("{");
if(lcurly != cmd.npos && lcurly < (cmd.size()-1))
{
std::string::size_type rcurly = cmd.find("}");
if(rcurly == cmd.npos || rcurly > lcurly)
{
// The first curly is a left curly. Use the hack.
std::string hack_cmd = cmd.substr(0, lcurly);
hack_cmd += "{{}";
hack_cmd += cmd.substr(lcurly+1);
cmd = hack_cmd;
}
}
}
commands1.push_back(cmd);
}
}