From 5ebab802cc360b6b7f3baf20cc7e4e57eddafef7 Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Date: Fri, 16 Aug 2024 23:02:17 +0200
Subject: [PATCH] SQL/Interbase: Add and document Interbase_ROOT

Instead specifying Interbase_INCLUDE_DIR and Interbase_LIBRARY allow to
use Interbase_ROOT instead. Use this new option in the sql driver
documentation.
Additionally add 'fbclient_ms' as possible library name so we don't need
to distinguish between Interbase and Firebird anymore.

Change-Id: I472f95f82ebb93888002deccdf5028a1827a4745
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 89dd15e359228a57351bddc2429db4d57863bc8f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 cmake/FindInterbase.cmake                     |  6 +++---
 .../doc/snippets/code/doc_src_sql-driver.qdoc | 21 ++-----------------
 src/sql/doc/src/sql-driver.qdoc               | 10 ++++-----
 3 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/cmake/FindInterbase.cmake b/cmake/FindInterbase.cmake
index 95b735e56aa..e9303f8d265 100644
--- a/cmake/FindInterbase.cmake
+++ b/cmake/FindInterbase.cmake
@@ -23,13 +23,13 @@
 
 find_path(Interbase_INCLUDE_DIR
           NAMES ibase.h
-          HINTS ${Interbase_INCLUDEDIR}
+          HINTS "${Interbase_INCLUDEDIR}" "${Interbase_ROOT}/include"
           PATH_SUFFIXES firebird
 )
 
 find_library(Interbase_LIBRARY
-             NAMES firebase_ms fbclient gds
-             HINTS ${Interbase_LIBDIR}
+             NAMES firebase_ms fbclient_ms fbclient gds
+             HINTS "${Interbase_LIBDIR}" "${Interbase_ROOT}/lib"
 )
 
 include(FindPackageHandleStandardArgs)
diff --git a/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc b/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc
index b131716d9a9..e38416d1748 100644
--- a/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc
+++ b/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc
@@ -141,38 +141,21 @@ cmake --install .
 //! [27]
 mkdir build-sqldrivers
 cd build-sqldrivers
-qt-cmake -G Ninja <qt_source_directory>/qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>/<platform> -DInterbase_INCLUDE_DIR="/opt/interbase/include" -DInterbase_LIBRARY="/opt/interbase/lib/libgds.<so|dylib>"
+qt-cmake -G Ninja <qt_source_directory>/qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>/<platform> -DInterbase_ROOT="/opt/interbase/"
 cmake --build .
 cmake --install .
 //! [27]
 
 
-//! [28]
-mkdir build-sqldrivers
-cd build-sqldrivers
-qt-cmake -G Ninja <qt_source_directory>/qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>/<platform> -DInterbase_INCLUDE_DIR="/opt/interbase/include" -DInterbase_LIBRARY="/opt/interbase/lib/libfbclient.<so|dylib>"
-cmake --build .
-cmake --install .
-//! [28]
-
-
 //! [29]
 mkdir build-sqldrivers
 cd build-sqldrivers
-qt-cmake -G Ninja <qt_installation_path>\Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>\<platform> -DInterbase_INCLUDE_DIR="C:\interbase\include" -DInterbase_LIBRARY="C:\interbase\gds.lib"
+qt-cmake -G Ninja <qt_installation_path>\Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>\<platform> -DInterbase_ROOT="C:\interbase"
 cmake --build .
 cmake --install .
 //! [29]
 
 
-//! [30]
-mkdir build-sqldrivers
-cd build-sqldrivers
-qt-cmake -G Ninja <qt_installation_path>\Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>\<platform> -DInterbase_INCLUDE_DIR="C:\interbase\include" -DInterbase_LIBRARY="C:\interbase\lib\fbclient_ms.lib"
-cmake --build .
-cmake --install .
-//! [30]
-
 //! [31]
 mkdir build-sqldrivers
 cd build-sqldrivers
diff --git a/src/sql/doc/src/sql-driver.qdoc b/src/sql/doc/src/sql-driver.qdoc
index 5e097865c1d..f829cc367ff 100644
--- a/src/sql/doc/src/sql-driver.qdoc
+++ b/src/sql/doc/src/sql-driver.qdoc
@@ -907,9 +907,8 @@
 
     \snippet code/doc_src_sql-driver.qdoc 27
 
-    If you are using Firebird, the Firebird library has to be set explicitly:
-
-    \snippet code/doc_src_sql-driver.qdoc 28
+    Optionally, use the CMake variables \c{Interbase_INCLUDE_DIR} and
+    \c{Interbase_LIBRARY} to specify the include path and library directly.
 
     \section3 How to Build the QIBASE Plugin on Windows
 
@@ -920,9 +919,8 @@
 
     \snippet code/doc_src_sql-driver.qdoc 29
 
-    If you are using Firebird:
-
-    \snippet code/doc_src_sql-driver.qdoc 30
+    Optionally, use the CMake variables \c{Interbase_INCLUDE_DIR} and
+    \c{Interbase_LIBRARY} to specify the include path and library directly.
 
     Note that \c{C:\interbase\bin} must be in the \c PATH.