From 89dd15e359228a57351bddc2429db4d57863bc8f Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Fri, 16 Aug 2024 23:02:17 +0200 Subject: 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. Pick-to: 6.8 Change-Id: I472f95f82ebb93888002deccdf5028a1827a4745 Reviewed-by: Alexandru Croitor --- src/sql/doc/snippets/code/doc_src_sql-driver.qdoc | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'src/sql/doc/snippets') 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 /qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=/ -DInterbase_INCLUDE_DIR="/opt/interbase/include" -DInterbase_LIBRARY="/opt/interbase/lib/libgds." +qt-cmake -G Ninja /qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=/ -DInterbase_ROOT="/opt/interbase/" cmake --build . cmake --install . //! [27] -//! [28] -mkdir build-sqldrivers -cd build-sqldrivers -qt-cmake -G Ninja /qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=/ -DInterbase_INCLUDE_DIR="/opt/interbase/include" -DInterbase_LIBRARY="/opt/interbase/lib/libfbclient." -cmake --build . -cmake --install . -//! [28] - - //! [29] mkdir build-sqldrivers cd build-sqldrivers -qt-cmake -G Ninja \Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=\ -DInterbase_INCLUDE_DIR="C:\interbase\include" -DInterbase_LIBRARY="C:\interbase\gds.lib" +qt-cmake -G Ninja \Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=\ -DInterbase_ROOT="C:\interbase" cmake --build . cmake --install . //! [29] -//! [30] -mkdir build-sqldrivers -cd build-sqldrivers -qt-cmake -G Ninja \Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=\ -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 -- cgit v1.2.3