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

ENH: Removed addition of compiler support directory include option since the find_*_options scripts now include it automatically.

This commit is contained in:
Brad King 2001-09-07 09:40:34 -04:00
parent a14057c1b3
commit 55e453a317
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Source/cmConfigureGccXmlCommand.cxx
View File

@ -195,23 +195,23 @@ bool cmConfigureGccXmlCommand::FindGccIncludeFlags()
{ {
this->SetError("Could not run find_gcc_options!"); this->SetError("Could not run find_gcc_options!");
return false; return false;
}
// Strip newline from end of flags.
if((flags.length() > 0)
&& (flags[flags.length()-1] == '\n'))
{
flags = flags.substr(0, flags.length()-1);
if((flags.length() > 0)
&& (flags[flags.length()-1] == '\r'))
{
flags = flags.substr(0, flags.length()-1);
}
} }
// Use the result of the command as the flags. // Use the result of the command as the flags.
m_Flags = 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; return true;
} }
@ -238,22 +238,21 @@ bool cmConfigureGccXmlCommand::FindMproIncludeFlags()
return false; return false;
} }
// 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;
// Strip newline from end of flags. // Strip newline from end of flags.
if((m_Flags.length() > 0) if((flags.length() > 0)
&& (m_Flags[m_Flags.length()-1] == '\n')) && (flags[flags.length()-1] == '\n'))
{ {
m_Flags = m_Flags.substr(0, m_Flags.length()-1); flags = flags.substr(0, flags.length()-1);
if((m_Flags.length() > 0) if((flags.length() > 0)
&& (m_Flags[m_Flags.length()-1] == '\r')) && (flags[flags.length()-1] == '\r'))
{ {
m_Flags = m_Flags.substr(0, m_Flags.length()-1); flags = flags.substr(0, flags.length()-1);
} }
} }
// Use the result of the command as the flags.
m_Flags = flags;
return true; return true;
} }