paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-07 16:38:02 +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;
NeedBuild: TModalResult;
begin
SkipDesignTimePackages:=false;
NewTargets:=GetTargets(TargetComboBox.Text);
try
if not HaveSameTargets(FTargets,NewTargets) then begin
// targets have changed
ClearTargets;
if NewTargets=nil then exit(true);
SkipDesignTimePackages:=false;
for i:=0 to NewTargets.Count-1 do begin
Item:=TInfoNeedBuildItem.Create;
Item.Target:=TObject(NewTargets[i]);

19
ide/project.pp
View File

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