diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-01-07 11:05:07 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-01-19 13:17:55 +0000 |
| commit | e74fd6897bbb511fe365e8189e04c0cdc4d51655 (patch) | |
| tree | eeb72638e6971b152c868c5289037023260339cf /cmake/FindMySQL.cmake | |
| parent | fd5006eb4835a1d72d0d3ab3d5b6491d4697eaeb (diff) | |
Adjust database packages FindFoo.cmake files to CMake convention
Replace package _LIBRARIES by _LIBRARY and _INCLUDE_DIRS by
_INCLUDE_DIR. Move find_package_handle_standard_args for Oracle and DB2,
since this call should set _FOUND variable but not separate condition.
Fixes: QTBUG-89866
Change-Id: I54be2c2c4d7ba4b849a27139702861ecd937c444
Reviewed-by: Craig Scott <craig.scott@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'cmake/FindMySQL.cmake')
| -rw-r--r-- | cmake/FindMySQL.cmake | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake index f6c77d2be1..a069a5eb12 100644 --- a/cmake/FindMySQL.cmake +++ b/cmake/FindMySQL.cmake @@ -21,29 +21,33 @@ find_package(PkgConfig QUIET) pkg_check_modules(PC_MySQL QUIET mysqlclient) -find_path(MySQL_INCLUDE_DIRS +find_path(MySQL_INCLUDE_DIR NAMES mysql.h HINTS ${PC_MySQL_INCLUDEDIR} PATH_SUFFIXES mysql mariadb) -find_library(MySQL_LIBRARIES +find_library(MySQL_LIBRARY NAMES libmysql mysql mysqlclient libmariadb mariadb HINTS ${PC_MySQL_LIBDIR}) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(MySQL DEFAULT_MSG MySQL_LIBRARIES MySQL_INCLUDE_DIRS) +find_package_handle_standard_args(MySQL DEFAULT_MSG MySQL_LIBRARY MySQL_INCLUDE_DIR) -if(MySQL_FOUND AND NOT TARGET MySQL::MySQL) +if(MySQL_FOUND) + set(MySQL_INCLUDE_DIRS "${MySQL_INCLUDE_DIR}") + set(MySQL_LIBRARIES "${MySQL_LIBRARY}") + if(NOT TARGET MySQL::MySQL) add_library(MySQL::MySQL UNKNOWN IMPORTED) set_target_properties(MySQL::MySQL PROPERTIES IMPORTED_LOCATION "${MySQL_LIBRARIES}" INTERFACE_INCLUDE_DIRECTORIES "${MySQL_INCLUDE_DIRS}") + endif() endif() -mark_as_advanced(MySQL_INCLUDE_DIRS MySQL_LIBRARIES) +mark_as_advanced(MySQL_INCLUDE_DIR MySQL_LIBRARY) include(FeatureSummary) set_package_properties(MySQL PROPERTIES - URL "https://www.mysql.com" - DESCRIPTION "MySQL client library") + URL "https://www.mysql.com" + DESCRIPTION "MySQL client library") |