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

SQL/Oracle: use Oracle_ROOT in documentation

Browse Source 
Instead specifying Oracle_INCLUDE_DIR/ORACLE_LIBRARY use Oracle_ROOT
which is suits much better for the usecase.

Pick-to: 6.8
Change-Id: I8a0858b3ae491212a79ad982eb8e067e6f1b750f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
This commit is contained in:
Christian Ehrlicher 2024-08-17 16:21:51 +02:00
parent a664a6e225
commit 5e478ebbcc
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/FindOracle.cmake
View File

@ -23,13 +23,16 @@
find_path(Oracle_INCLUDE_DIR find_path(Oracle_INCLUDE_DIR
NAMES oci.h NAMES oci.h
HINTS ${Oracle_INCLUDE_DIR}) HINTS ${Oracle_INCLUDE_DIR} "${Oracle_ROOT}" "${Oracle_ROOT}/include" "${Oracle_ROOT}/sdk/include"
)
set(ORACLE_OCI_NAMES clntsh ociei oraociei12 oci) set(ORACLE_OCI_NAMES clntsh ociei oraociei12 oci)
find_library(Oracle_LIBRARY find_library(Oracle_LIBRARY
NAMES ${ORACLE_OCI_NAMES} NAMES ${ORACLE_OCI_NAMES}
HINTS ${Oracle_LIBRARY_DIR}) HINTS ${Oracle_LIBRARY_DIR} "${Oracle_ROOT}" "${Oracle_ROOT}/lib" "${Oracle_ROOT}/sdk/lib"
PATH_SUFFIXES msvc
)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Oracle DEFAULT_MSG Oracle_LIBRARY Oracle_INCLUDE_DIR) find_package_handle_standard_args(Oracle DEFAULT_MSG Oracle_LIBRARY Oracle_INCLUDE_DIR)

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

@ -45,7 +45,7 @@ cmake --install .
//! [7] //! [7]
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> -DOracle_INCLUDE_DIR="/usr/include/oracle/21/client64" -DOracle_LIBRARY="/usr/lib/oracle/21/client64/lib/libclntsh.<so|dylib>" qt-cmake -G Ninja <qt_source_directory>/qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>/<platform> -DOracle_ROOT="/usr/include/oracle/21/client64"
cmake --build . cmake --build .
cmake --install . cmake --install .
//! [7] //! [7]
@ -54,7 +54,7 @@ cmake --install .
//! [8] //! [8]
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> -DOracle_INCLUDE_DIR="C:\oracle\sdk\include" -DOracle_LIBRARY="C:\oracle\oci.lib" qt-cmake -G Ninja <qt_installation_path>\Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>\<platform> -DOracle_ROOT="C:\oracle"
cmake --build . cmake --build .
cmake --install . cmake --install .
//! [8] //! [8]