paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-25 20:47:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

IDE: mode matrix: fixed showing targets

Browse Source 
git-svn-id: trunk@42834 -
This commit is contained in:
mattias 2013-09-16 08:34:11 +00:00
parent 1f8ace209d
commit fdff91aba6
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ide/frames/compiler_modematrix.pas
View File

@ -218,6 +218,7 @@ begin
if OptIndex>=Options.Count then exit; if OptIndex>=Options.Count then exit;
// compare option // compare option
Option:=Options[OptIndex]; Option:=Options[OptIndex];
//debugln(['IsEqual ',Option.AsString,' Targets="',Option.Targets,'" Target.Value="',Target.Value,'"']);
if Option.Targets<>Target.Value then exit; if Option.Targets<>Target.Value then exit;
if Option.Modes<>ValueRow.GetNormalizedModes then exit; if Option.Modes<>ValueRow.GetNormalizedModes then exit;
if Option.Typ<>CaptionToBuildMatrixOptionType(ValueRow.Typ) then exit; if Option.Typ<>CaptionToBuildMatrixOptionType(ValueRow.Typ) then exit;
@ -247,8 +248,10 @@ begin
TargetGrp:=nil; TargetGrp:=nil;
for OptIndex:=0 to Options.Count-1 do begin for OptIndex:=0 to Options.Count-1 do begin
Option:=Options[OptIndex]; Option:=Options[OptIndex];
if (TargetGrp=nil) or (TargetGrp.Value<>Option.Targets) then if (TargetGrp=nil) or (TargetGrp.Value<>Option.Targets) then begin
TargetGrp:=AddMatrixTarget(Matrix,StorageGroup); TargetGrp:=AddMatrixTarget(Matrix,StorageGroup);
TargetGrp.Value:=Option.Targets;
end;
Value:=Option.Value; Value:=Option.Value;
if Option.Typ=bmotIDEMacro then if Option.Typ=bmotIDEMacro then
Value:=Option.MacroName+':='+Value; Value:=Option.MacroName+':='+Value;
@ -278,6 +281,7 @@ begin
exit; exit;
end; end;
Targets:=UTF8Trim(Target.Value); Targets:=UTF8Trim(Target.Value);
//debugln(['AssignBuildMatrixGroupToOptions Targets=',Targets]);
for i:=0 to Target.Count-1 do begin for i:=0 to Target.Count-1 do begin
ValueRow:=TGroupedMatrixValue(Target[i]); ValueRow:=TGroupedMatrixValue(Target[i]);
if not (ValueRow is TGroupedMatrixValue) then begin if not (ValueRow is TGroupedMatrixValue) then begin
@ -295,6 +299,7 @@ begin
end else begin end else begin
Option.Value:=UTF8Trim(ValueRow.Value); Option.Value:=UTF8Trim(ValueRow.Value);
end; end;
//debugln(['AssignBuildMatrixGroupToOptions Option=',Option.AsString]);
end; end;
end; end;
if InvalidateBuildMacros then if InvalidateBuildMacros then