From 0c0b5cbb0d0b43f6be4e54caea89d5764511e94f Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Sat, 17 Aug 2024 11:55:30 +0200 Subject: 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 Reviewed-by: Alexandru Croitor --- src/sql/doc/snippets/code/doc_src_sql-driver.qdoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/sql/doc/snippets/code') 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 /qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=/ -DMySQL_INCLUDE_DIR="/usr/local/mysql/include" -DMySQL_LIBRARY="/usr/local/mysql/lib/libmysqlclient." +qt-cmake -G Ninja /qtbase/src/plugins/sqldrivers -DCMAKE_INSTALL_PREFIX=/ -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 \Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=\ -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 \Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=\ -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: ... -- cgit v1.2.3