diff --git a/components/projectgroups/projectgroup.pp b/components/projectgroups/projectgroup.pp index bb86d520a2..50132d23a6 100644 --- a/components/projectgroups/projectgroup.pp +++ b/components/projectgroups/projectgroup.pp @@ -211,7 +211,6 @@ end; procedure TIDEProjectGroupManager.DoNewClick(Sender: TObject); var AProject: TLazProject; - T: TIDECompileTarget; begin if Not CheckSaved then Exit; @@ -222,8 +221,7 @@ begin AProject:=LazarusIDE.ActiveProject; if (AProject<>nil) and FilenameIsAbsolute(AProject.ProjectInfoFile) and FileExistsCached(AProject.ProjectInfoFile) then begin - T:=FProjectGroup.AddTarget(AProject.ProjectInfoFile) as TIDECompileTarget; - if T<>nil then T.LoadTarget; + FProjectGroup.AddTarget(AProject.ProjectInfoFile); end; ShowProjectGroupEditor; @@ -653,8 +651,8 @@ begin if ProjFile.IsPartOfProject then FFiles.Add(ProjFile.Filename); end; - // ToDo: dependencies + // load dependencies from active project PkgList:=nil; try PackageEditingInterface.GetRequiredPackages(AProject,PkgList,[pirCompileOrder]); @@ -671,6 +669,8 @@ begin end; end else begin // load from .lpi file + + LazarusIDE.ActiveProject; // ToDo end; end; diff --git a/components/projectgroups/projectgroupeditor.pas b/components/projectgroups/projectgroupeditor.pas index 052690700c..7f84d37728 100644 --- a/components/projectgroups/projectgroupeditor.pas +++ b/components/projectgroups/projectgroupeditor.pas @@ -495,6 +495,7 @@ Var N: TTreeNode; begin PG:=Sender as TProjectGroup; + (Target as TIDECompileTarget).LoadTarget; // ToDo: use of FTargetNodes is wrong if PG<>FProjectGroup N:=CreateNode(FTargetNodes[False],DisplayFileName(PG,ntTarget,Target.Filename),ntTarget,Target,PG); FillTargetNode(N,PG,Target);