1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SQL/Interbase: Add and document Interbase_ROOT

Browse Source 
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>
This commit is contained in:
Christian Ehrlicher 2024-08-16 23:02:17 +02:00 committed by Qt Cherry-pick Bot
parent 6065ed9948
commit 5ebab802cc
3 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/FindInterbase.cmake
View File

@ -23,13 +23,13 @@
find_path(Interbase_INCLUDE_DIR find_path(Interbase_INCLUDE_DIR
NAMES ibase.h NAMES ibase.h
HINTS ${Interbase_INCLUDEDIR} HINTS "${Interbase_INCLUDEDIR}" "${Interbase_ROOT}/include"
PATH_SUFFIXES firebird PATH_SUFFIXES firebird
) )
find_library(Interbase_LIBRARY find_library(Interbase_LIBRARY
NAMES firebase_ms fbclient gds NAMES firebase_ms fbclient_ms fbclient gds
HINTS ${Interbase_LIBDIR} HINTS "${Interbase_LIBDIR}" "${Interbase_ROOT}/lib"
) )
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)

21
src/sql/doc/snippets/code/doc_src_sql-driver.qdoc
View File

@ -141,38 +141,21 @@ cmake --install .
//! [27] //! [27]
mkdir build-sqldrivers mkdir build-sqldrivers
cd 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 --build .
cmake --install . cmake --install .
//! [27] //! [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] //! [29]
mkdir build-sqldrivers mkdir build-sqldrivers
cd 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 --build .
cmake --install . cmake --install .
//! [29] //! [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] //! [31]
mkdir build-sqldrivers mkdir build-sqldrivers
cd build-sqldrivers cd build-sqldrivers

10
src/sql/doc/src/sql-driver.qdoc
View File

@ -907,9 +907,8 @@
\snippet code/doc_src_sql-driver.qdoc 27 \snippet code/doc_src_sql-driver.qdoc 27
If you are using Firebird, the Firebird library has to be set explicitly: Optionally, use the CMake variables \c{Interbase_INCLUDE_DIR} and
\c{Interbase_LIBRARY} to specify the include path and library directly.
\snippet code/doc_src_sql-driver.qdoc 28
\section3 How to Build the QIBASE Plugin on Windows \section3 How to Build the QIBASE Plugin on Windows
@ -920,9 +919,8 @@
\snippet code/doc_src_sql-driver.qdoc 29 \snippet code/doc_src_sql-driver.qdoc 29
If you are using Firebird: Optionally, use the CMake variables \c{Interbase_INCLUDE_DIR} and
\c{Interbase_LIBRARY} to specify the include path and library directly.
\snippet code/doc_src_sql-driver.qdoc 30
Note that \c{C:\interbase\bin} must be in the \c PATH. Note that \c{C:\interbase\bin} must be in the \c PATH.