IDE: project compiler option fpc message file: default to environment option

git-svn-id: trunk@34485 -
This commit is contained in:
mattias 2011-12-29 00:23:15 +00:00
parent 365b0f4cbc
commit 97fac1bc4c

View File

@ -1509,7 +1509,7 @@ begin
// messages // messages
if fCompilerMessages.Count = 0 then fCompilerMessages.SetDefault; if fCompilerMessages.Count = 0 then fCompilerMessages.SetDefault;
UseMsgFile := aXMLConfig.GetValue(p+'CompilerMessages/UseMsgFile/Value', False); UseMsgFile := aXMLConfig.GetValue(p+'CompilerMessages/UseMsgFile/Value', False);
MsgFileName := aXMLConfig.GetValue(p+'CompilerMessages/MsgFileName/Value', ''); MsgFileName := aXMLConfig.GetValue(p+'CompilerMessages/MsgFileName/Value', '$(FPCMsgFile)');
if UseMsgFile and FileExistsCached(GetParsedMsgFilename) then if UseMsgFile and FileExistsCached(GetParsedMsgFilename) then
fCompilerMessages.LoadMsgFile(GetParsedMsgFilename); fCompilerMessages.LoadMsgFile(GetParsedMsgFilename);
@ -1711,7 +1711,7 @@ begin
end; end;
end; end;
aXMLConfig.SetDeleteValue(p+'CompilerMessages/UseMsgFile/Value', UseMsgFile, False); aXMLConfig.SetDeleteValue(p+'CompilerMessages/UseMsgFile/Value', UseMsgFile, False);
aXMLConfig.SetDeleteValue(p+'CompilerMessages/MsgFileName/Value', MsgFileName, ''); aXMLConfig.SetDeleteValue(p+'CompilerMessages/MsgFileName/Value', MsgFileName, '$(FPCMsgFile)');
aXMLConfig.SetDeleteValue(p+'CompilerMessages/ErrorNames/Hint', CompilerMessages.ErrorNames[etHint], FPCErrorTypeNames[etHint]); aXMLConfig.SetDeleteValue(p+'CompilerMessages/ErrorNames/Hint', CompilerMessages.ErrorNames[etHint], FPCErrorTypeNames[etHint]);
aXMLConfig.SetDeleteValue(p+'CompilerMessages/ErrorNames/Note', CompilerMessages.ErrorNames[etNote], FPCErrorTypeNames[etNote]); aXMLConfig.SetDeleteValue(p+'CompilerMessages/ErrorNames/Note', CompilerMessages.ErrorNames[etNote], FPCErrorTypeNames[etNote]);