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

ENH: allow for - in the name of targets for nmake

Browse Source
This commit is contained in:
Bill Hoffman 2006-02-06 16:32:09 -05:00
parent a5d2c59c39
commit 185cb0b5bf
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -2561,7 +2561,8 @@ cmLocalUnixMakefileGenerator3
// if there is no restriction on the length of make variables // if there is no restriction on the length of make variables
// and there are no "." charactors in the string, then return the // and there are no "." charactors in the string, then return the
// unmodified combination. // unmodified combination.
if(!m_MakefileVariableSize && unmodified.find('.') == s.npos) if((!m_MakefileVariableSize && unmodified.find('.') == s.npos)
&& (!m_MakefileVariableSize && unmodified.find('-') == s.npos))
{ {
return unmodified; return unmodified;
} }
@ -2580,6 +2581,7 @@ cmLocalUnixMakefileGenerator3
if(!m_MakefileVariableSize) if(!m_MakefileVariableSize)
{ {
cmSystemTools::ReplaceString(ret, ".", "_"); cmSystemTools::ReplaceString(ret, ".", "_");
cmSystemTools::ReplaceString(ret, "-", "__");
int ni = 0; int ni = 0;
char buffer[5]; char buffer[5];
// make sure the _ version is not already used, if // make sure the _ version is not already used, if