lazbuild: widgetsetoverride as matrix option

git-svn-id: trunk@41532 -
This commit is contained in:
mattias 2013-06-04 07:53:37 +00:00
parent 88fd2a64e1
commit faa9659c56

View File

@ -38,9 +38,9 @@ uses
// IDE // IDE
IDEProcs, InitialSetupDlgs, OutputFilter, CompilerOptions, ApplicationBundle, IDEProcs, InitialSetupDlgs, OutputFilter, CompilerOptions, ApplicationBundle,
TransferMacros, EnvironmentOpts, IDETranslations, LazarusIDEStrConsts, TransferMacros, EnvironmentOpts, IDETranslations, LazarusIDEStrConsts,
IDECmdLine, ExtToolDialog, IDECmdLine, ExtToolDialog, MiscOptions, Project, LazConf, PackageDefs,
MiscOptions, Project, LazConf, PackageDefs, PackageLinks, PackageSystem, PackageLinks, PackageSystem, BuildLazDialog, BuildProfileManager,
BuildLazDialog, BuildProfileManager, BuildManager, BaseBuildManager; BuildManager, BaseBuildManager, ModeMatrixOpts;
type type
@ -716,6 +716,7 @@ var
Note: String; Note: String;
NeedBuildAllFlag: Boolean; NeedBuildAllFlag: Boolean;
SubResult: TModalResult; SubResult: TModalResult;
MatrixOption: TBuildMatrixOption;
begin begin
Result:=false; Result:=false;
CloseProject(Project1); CloseProject(Project1);
@ -761,7 +762,11 @@ begin
if (CPUOverride<>'') then if (CPUOverride<>'') then
Project1.CompilerOptions.TargetCPU:=CPUOverride; Project1.CompilerOptions.TargetCPU:=CPUOverride;
if (WidgetSetOverride<>'') then begin if (WidgetSetOverride<>'') then begin
{$IFDEF EnableModeMacro} {$IFDEF EnableModeMatrix}
MatrixOption:=Project1.BuildModes.SessionMatrixOptions.Add(bmotIDEMacro);
MatrixOption.Modes:=Project1.ActiveBuildMode.Identifier;
MatrixOption.MacroName:='LCLWidgetType';
MatrixOption.Value:=WidgetSetOverride;
{$ELSE} {$ELSE}
Project1.ActiveBuildMode.MacroValues.Values['LCLWidgetType']:=WidgetSetOverride; Project1.ActiveBuildMode.MacroValues.Values['LCLWidgetType']:=WidgetSetOverride;
{$ENDIF} {$ENDIF}