diff options
| author | Christian Ehrlicher <[email protected]> | 2024-08-17 11:55:30 +0200 |
|---|---|---|
| committer | Christian Ehrlicher <[email protected]> | 2024-08-28 21:52:27 +0200 |
| commit | 0c0b5cbb0d0b43f6be4e54caea89d5764511e94f (patch) | |
| tree | 758021ea63daef5a00843f5f865c47aaff10147d | |
| parent | 5e478ebbcc42471b4c70c10bb513e7343c05933e (diff) | |
SQL/MySQL: use MySQL_ROOT in documentation
Instead specifying CMAKE_INCLUDE_PATH/CMAKE_LIBRARY_PATH use
MySQL_ROOT which is suits much better for the usecase.
Pick-to: 6.8
Change-Id: Ieb75f80a6eb3a3e7913a7c04ca6511a014fa7e4e
Reviewed-by: Venugopal Shivashankar <[email protected]>
Reviewed-by: Alexandru Croitor <[email protected]>
| -rw-r--r-- | cmake/FindMySQL.cmake | 2 | ||||
| -rw-r--r-- | src/sql/doc/snippets/code/doc_src_sql-driver.qdoc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake index d191d1ac0a3..3dedca85759 100644 --- a/cmake/FindMySQL.cmake +++ b/cmake/FindMySQL.cmake @@ -48,7 +48,7 @@ if(PkgConfig_FOUND AND NOT DEFINED MySQL_ROOT) set(MySQL_library_hints ${PC_MySQL_LIBDIR}) set(MySQL_library_hints_debug "") else() - set(MySQL_include_dir_hints "") + set(MySQL_include_dir_hints "${MySQL_ROOT}" "${MySQL_ROOT}/include") if(NOT DEFINED MySQL_LIBRARY_DIR) set(MySQL_LIBRARY_DIR "${MySQL_ROOT}/lib") endif() 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 54860277d4d..b131716d9a9 100644 --- a/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc +++ b/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc @@ -27,7 +27,7 @@ END //! [3] mkdir build-sqldrivers cd build-sqldrivers -qt-cmake -G Ninja <qt_source_directory>/qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>/<platform> -DMySQL_INCLUDE_DIR="/usr/local/mysql/include" -DMySQL_LIBRARY="/usr/local/mysql/lib/libmysqlclient.<so|dylib>" +qt-cmake -G Ninja <qt_source_directory>/qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>/<platform> -DMySQL_ROOT="/usr/local/mysql" cmake --build . cmake --install . //! [3] @@ -36,7 +36,7 @@ cmake --install . //! [5] 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> -DMySQL_INCLUDE_DIR="C:\mysql-8.0.22-winx64\include" -DMySQL_LIBRARY="C:\mysql-8.0.22-winx64\lib\libmysql.lib" +qt-cmake -G Ninja <qt_installation_path>\Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>\<platform> -DMySQL_ROOT="C:\mysql-8.0.22-winx64" cmake --build . cmake --install . //! [5] @@ -236,7 +236,7 @@ Qt Sql Drivers: //! [41] //! [42] -C:\Qt\6.0.0\Src\configure.bat -sql-mysql -- -DMySQL_INCLUDE_DIR="C:\mysql-8.0.22-winx64\include" -DMySQL_LIBRARY="C:\mysql-8.0.22-winx64\lib\libmysql.lib" +C:\Qt\6.0.0\Src\configure.bat -sql-mysql -- -DMySQL_ROOT="C:\mysql-8.0.22-winx64" Configure summary: ... |