fix: load libs from ../Frameworks on macOS

ansgarbecker · ansgarbecker · commit 8f6ba688cbcd · 2025-12-15T08:06:03.000+01:00
Refs #2238
diff --git a/source/apphelpers.pas b/source/apphelpers.pas
@@ -357,6 +357,7 @@   TAppSettings = class(TObject)
   function FormatTimeNumber(Seconds: Double; DisplaySeconds: Boolean; MilliSecondsPrecision: Integer=1): String;
   //function GetTempDir: String;
   function GetAppDir: String;
+  function GetLibDir: String;
   procedure SaveUnicodeFile(Filename: String; Text: String; Encoding: TEncoding);
   procedure OpenTextFile(const Filename: String; out Stream: TFileStream; var Encoding: TEncoding);
   function DetectEncoding(Stream: TStream): TEncoding;
@@ -1303,6 +1304,19 @@ function GetAppDir: String;
   Result := ExtractFilePath(Application.ExeName);
 end;
 
+function GetLibDir: String;
+begin
+  {$IFDEF WINDOWS}
+  Result := GetAppDir;
+  {$ENDIF}
+  {$IFDEF DARWIN}
+  Result := GetAppDir + '..' + DirectorySeparator + 'Frameworks' + DirectorySeparator;
+  {$ENDIF}
+  {$IFDEF LINUX}
+  Result := '';
+  {$ENDIF}
+end;
+
 {**
   Save a textfile with unicode
 }
diff --git a/source/dbconnection.pas b/source/dbconnection.pas
@@ -1949,9 +1949,9 @@ function TConnectionParameters.GetLibraries: TStringList;
         rx.Expression := '^\s*(libsqlite3)[^=]+=>\s*(\S+)$';
         {$Else}
         if NetType = ntSQLite then
-          rx.Expression := '^sqlite.*\.' + SharedSuffix
+          rx.Expression := '^(lib)?sqlite.*\.' + SharedSuffix
         else
-          rx.Expression := '^sqlite3mc.*\.' + SharedSuffix;
+          rx.Expression := '^(lib)?sqlite3mc.*\.' + SharedSuffix;
         {$EndIf}
       end;
       ngInterbase:
@@ -1969,7 +1969,7 @@ function TConnectionParameters.GetLibraries: TStringList;
           end;
         end;
         {$Else}
-        Dlls := FindAllFiles(GetAppDir, '*.' + SharedSuffix, False);
+        Dlls := FindAllFiles(GetLibDir, '*.' + SharedSuffix, False);
         for DllPath in Dlls do begin
           DllFile := ExtractFileName(DllPath);
           if rx.Exec(DllFile) then begin
@@ -3300,7 +3300,7 @@ procedure TMySQLConnection.DoBeforeConnect;
   LibraryPath: String;
 begin
   // Init libmysql before actually connecting.
-  LibraryPath := {$IFNDEF LINUX}GetAppDir + {$ENDIF} Parameters.LibraryOrProvider;
+  LibraryPath := GetLibDir + Parameters.LibraryOrProvider;
   Log(lcDebug, f_('Loading library file %s ...', [LibraryPath]));
   // Throws EDbError on any failure:
   FLib := TMySQLLib.Create(LibraryPath, Parameters.DefaultLibrary);
@@ -3315,7 +3315,7 @@ procedure TPgConnection.DoBeforeConnect;
   msg: String;
 begin
   // Init lib before actually connecting.
-  LibraryPath := {$IFNDEF LINUX}GetAppDir + {$ENDIF} Parameters.LibraryOrProvider;
+  LibraryPath := GetLibDir + Parameters.LibraryOrProvider;
   Log(lcDebug, f_('Loading library file %s ...', [LibraryPath]));
   try
     FLib := TPostgreSQLLib.Create(LibraryPath, Parameters.DefaultLibrary);
@@ -3346,7 +3346,7 @@ procedure TSQLiteConnection.DoBeforeConnect;
   LibraryPath: String;
 begin
   // Init lib before actually connecting.
-  LibraryPath := {$IFNDEF LINUX}GetAppDir + {$ENDIF} Parameters.LibraryOrProvider;
+  LibraryPath := GetLibDir + Parameters.LibraryOrProvider;
   Log(lcDebug, f_('Loading library file %s ...', [LibraryPath]));
   // Throws EDbError on any failure:
   if Parameters.NetType = ntSQLite then
