paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 21:41:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes compilation with FPC 3.0.4 and fixes typo in function name

Browse Source 
git-svn-id: trunk@59980 -
This commit is contained in:
sekelsenmat 2019-01-03 15:44:58 +00:00
parent b3d89674dc
commit 7778c69e15
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packager/fppkghelper.pas
View File

@ -37,7 +37,7 @@ type
function HasPackage(const PackageName: string): Boolean; function HasPackage(const PackageName: string): Boolean;
procedure ListPackages(AList: TStringList); procedure ListPackages(AList: TStringList);
function GetPackageUnitPath(const PackageName: string): string; function GetPackageUnitPath(const PackageName: string): string;
function IsProperyConfigured: Boolean; function IsProperlyConfigured: Boolean;
// Temporary solution, because fpc 3.2.0 does not has support for package-variants // Temporary solution, because fpc 3.2.0 does not has support for package-variants
// in TFPPackage // in TFPPackage
function GetPackageVariantArray(const PackageName: string): TFppkgPackageVariantArray; function GetPackageVariantArray(const PackageName: string): TFppkgPackageVariantArray;
@ -102,7 +102,7 @@ end;
function TFppkgHelper.HasPackage(const PackageName: string): Boolean; function TFppkgHelper.HasPackage(const PackageName: string): Boolean;
begin begin
{$IFNDEF VER3_0} {$IFNDEF VER3_0}
if IsProperyConfigured then if IsProperlyConfigured() then
begin begin
Result := Result :=
Assigned(FFPpkg.FindPackage(PackageName,pkgpkInstalled)) or Assigned(FFPpkg.FindPackage(PackageName,pkgpkInstalled)) or
@ -249,14 +249,16 @@ begin
{$ENDIF FPC_FULLVERSION>30100} {$ENDIF FPC_FULLVERSION>30100}
end; end;
function TFppkgHelper.IsProperyConfigured: Boolean; function TFppkgHelper.IsProperlyConfigured: Boolean;
begin begin
{$IF FPC_FULLVERSION>30100}
if Assigned(FFPpkg) and (FIsProperlyConfigured=fpcUnknown) then if Assigned(FFPpkg) and (FIsProperlyConfigured=fpcUnknown) then
begin begin
FIsProperlyConfigured := fpcYes; FIsProperlyConfigured := fpcYes;
if not HasPackage('rtl') then if not HasPackage('rtl') then
FIsProperlyConfigured := fpcNo; FIsProperlyConfigured := fpcNo;
end; end;
{$ENDIF FPC_FULLVERSION>30100}
result := FIsProperlyConfigured=fpcYes; result := FIsProperlyConfigured=fpcYes;
end; end;