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

BUG: GCCXML_FLAGS found from find_gcc_options or find_mpro_options should have the trailing newline stripped from the string.

This commit is contained in:
Brad King 2001-08-29 17:11:03 -04:00
parent 2eefa2286a
commit 754e1cb9a5
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Source/cmConfigureGccXmlCommand.cxx
View File

@ -200,6 +200,18 @@ bool cmConfigureGccXmlCommand::FindGccIncludeFlags()
// Use the result of the command as the flags.
m_Flags = flags;
// Strip newline from end of flags.
if((m_Flags.length() > 0)
&& (m_Flags[m_Flags.length()-1] == '\n'))
{
m_Flags = m_Flags.substr(0, m_Flags.length()-1);
if((m_Flags.length() > 0)
&& (m_Flags[m_Flags.length()-1] == '\r'))
{
m_Flags = m_Flags.substr(0, m_Flags.length()-1);
}
}
return true;
}
@ -228,8 +240,20 @@ bool cmConfigureGccXmlCommand::FindMproIncludeFlags()
// Use the result of the command as the flags. Also prefix on the
// include path flag for the support directory.
m_Flags = "-I"+supportDir+" "+flags;
m_Flags = "-I"+supportDir+" "+flags;
// Strip newline from end of flags.
if((m_Flags.length() > 0)
&& (m_Flags[m_Flags.length()-1] == '\n'))
{
m_Flags = m_Flags.substr(0, m_Flags.length()-1);
if((m_Flags.length() > 0)
&& (m_Flags[m_Flags.length()-1] == '\r'))
{
m_Flags = m_Flags.substr(0, m_Flags.length()-1);
}
}
return true;
}