paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-24 13:19:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: inherited compiler options: excluded inheritance of designtime packages

Browse Source 
git-svn-id: trunk@40289 -
This commit is contained in:
mattias 2013-02-13 09:43:05 +00:00
parent aa18d686ac
commit b18f3e7927
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ide/ideinfoneedbuild.pas
View File

@ -241,13 +241,13 @@ var
NeedBuildAll: boolean; NeedBuildAll: boolean;
NeedBuild: TModalResult; NeedBuild: TModalResult;
begin begin
SkipDesignTimePackages:=false;
NewTargets:=GetTargets(TargetComboBox.Text); NewTargets:=GetTargets(TargetComboBox.Text);
try try
if not HaveSameTargets(FTargets,NewTargets) then begin if not HaveSameTargets(FTargets,NewTargets) then begin
// targets have changed // targets have changed
ClearTargets; ClearTargets;
if NewTargets=nil then exit(true); if NewTargets=nil then exit(true);
SkipDesignTimePackages:=false;
for i:=0 to NewTargets.Count-1 do begin for i:=0 to NewTargets.Count-1 do begin
Item:=TInfoNeedBuildItem.Create; Item:=TInfoNeedBuildItem.Create;
Item.Target:=TObject(NewTargets[i]); Item.Target:=TObject(NewTargets[i]);

19
ide/project.pp
View File

@ -6082,19 +6082,18 @@ procedure TProjectCompilerOptions.GetInheritedCompilerOptions(
var OptionsList: TFPList); var OptionsList: TFPList);
var var
PkgList: TFPList; PkgList: TFPList;
i: Integer; ReqFlags: TPkgIntfRequiredFlags;
begin begin
PkgList:=nil; PkgList:=nil;
LazProject.GetAllRequiredPackages(PkgList); try
if (PkgList<>nil) ReqFlags:=[];
and (not (pfUseDesignTimePackages in LazProject.Flags)) then begin if not (pfUseDesignTimePackages in LazProject.Flags) then
// remove design time only packages Include(ReqFlags,pirSkipDesignTimeOnly);
for i:=PkgList.Count-1 downto 0 do LazProject.GetAllRequiredPackages(PkgList,ReqFlags);
if TLazPackage(PkgList[i]).PackageType=lptDesignTime then OptionsList:=GetUsageOptionsList(PkgList);
PkgList.Delete(i); finally
PkgList.Free;
end; end;
OptionsList:=GetUsageOptionsList(PkgList);
PkgList.Free;
end; end;
{ TProjectDefineTemplates } { TProjectDefineTemplates }