|
|
@@ -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;
|
|
|
}
|
|
|
|