mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-11-05 08:01:53 +01:00
IDE: fixed applying macro defaults
git-svn-id: trunk@41336 -
This commit is contained in:
parent
c8408ddee7
commit
ed2d368f37
@ -2264,7 +2264,6 @@ function TBuildManager.OnGetBuildMacroValues(Options: TBaseCompilerOptions;
|
|||||||
ApplyBuildMatrixMacros(Project1.BuildModes.SessionMatrixOptions,Target,Vars);
|
ApplyBuildMatrixMacros(Project1.BuildModes.SessionMatrixOptions,Target,Vars);
|
||||||
end;
|
end;
|
||||||
SetCmdLineOverrides(Vars);
|
SetCmdLineOverrides(Vars);
|
||||||
SetDefaults(Vars);
|
|
||||||
{$IFDEF VerboseBuildMacros}
|
{$IFDEF VerboseBuildMacros}
|
||||||
Vars.WriteDebugReport('OnGetBuildMacroValues after applying project values');
|
Vars.WriteDebugReport('OnGetBuildMacroValues after applying project values');
|
||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
@ -2276,6 +2275,7 @@ function TBuildManager.OnGetBuildMacroValues(Options: TBaseCompilerOptions;
|
|||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
Vars.AddOverrides(Values);
|
Vars.AddOverrides(Values);
|
||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
|
SetDefaults(Vars);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
var
|
var
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user