diff options
| author | Christian Ehrlicher <[email protected]> | 2024-08-17 16:21:51 +0200 |
|---|---|---|
| committer | Christian Ehrlicher <[email protected]> | 2024-08-28 21:52:27 +0200 |
| commit | 5e478ebbcc42471b4c70c10bb513e7343c05933e (patch) | |
| tree | 5809b2dddd278d27f36b03a95f952d7a8228876e | |
| parent | a664a6e225abdd4a62aac57df10e3507fcd2b561 (diff) | |
SQL/Oracle: use Oracle_ROOT in documentation
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 <[email protected]>
Reviewed-by: Venugopal Shivashankar <[email protected]>
| -rw-r--r-- | cmake/FindOracle.cmake | 7 | ||||
| -rw-r--r-- | src/sql/doc/snippets/code/doc_src_sql-driver.qdoc | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/cmake/FindOracle.cmake b/cmake/FindOracle.cmake index e05bdd749e5..98819980b1a 100644 --- a/cmake/FindOracle.cmake +++ b/cmake/FindOracle.cmake @@ -23,13 +23,16 @@ find_path(Oracle_INCLUDE_DIR 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) find_library(Oracle_LIBRARY 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) find_package_handle_standard_args(Oracle DEFAULT_MSG Oracle_LIBRARY Oracle_INCLUDE_DIR) 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 66a8a5e1ca2..54860277d4d 100644 --- a/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc +++ b/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc @@ -45,7 +45,7 @@ cmake --install . //! [7] mkdir 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 --install . //! [7] @@ -54,7 +54,7 @@ cmake --install . //! [8] 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> -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 --install . //! [8] |