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/FindDB2.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/FindDB2.cmake')
| -rw-r--r-- | cmake/FindDB2.cmake | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/cmake/FindDB2.cmake b/cmake/FindDB2.cmake index f2decb6809..e5b81cc9a5 100644 --- a/cmake/FindDB2.cmake +++ b/cmake/FindDB2.cmake @@ -19,43 +19,44 @@ # The db2 client library if (NOT DEFINED DB2_INCLUDE_DIR) - find_path(DB2_INCLUDE_DIRS + find_path(DB2_INCLUDE_DIR NAMES sqlcli1.h HINTS ENV DB2_HOME PATH_SUFFIXES include) else() - find_path(DB2_INCLUDE_DIRS + find_path(DB2_INCLUDE_DIR NAMES sqlcli1.h HINTS ${DB2_INCLUDE_DIR}) endif() if (NOT DEFINED DB2_LIBRARY_DIR) - find_library(DB2_LIBRARIES + find_library(DB2_LIBRARY NAMES db2 HINTS ENV DB2LIB) else() - find_library(DB2_LIBRARIES + find_library(DB2_LIBRARY NAMES db2 HINTS ${DB2_LIBRARY_DIR}) endif() -if (NOT DB2_INCLUDE_DIRS STREQUAL "DB2_INCLUDE_DIRS-NOTFOUND" AND NOT DB2_LIBRARIES STREQUAL "DB2_LIBRARIES-NOTFOUND") - set(DB2_FOUND ON) -endif() +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(DB2 DEFAULT_MSG DB2_INCLUDE_DIR DB2_LIBRARY) -if(DB2_FOUND AND NOT TARGET DB2::DB2) - add_library(DB2::DB2 UNKNOWN IMPORTED) - set_target_properties(DB2::DB2 PROPERTIES - IMPORTED_LOCATION "${DB2_LIBRARIES}" - INTERFACE_INCLUDE_DIRECTORIES "${DB2_INCLUDE_DIRS}") +if(DB2_FOUND) + set(DB2_INCLUDE_DIRS "${DB2_INCLUDE_DIR}") + set(DB2_LIBRARIES "${DB2_LIBRARY}") + if(NOT TARGET DB2::DB2) + add_library(DB2::DB2 UNKNOWN IMPORTED) + set_target_properties(DB2::DB2 PROPERTIES + IMPORTED_LOCATION "${DB2_LIBRARIES}" + INTERFACE_INCLUDE_DIRECTORIES "${DB2_INCLUDE_DIRS}") + endif() endif() -mark_as_advanced(DB2_INCLUDE_DIRS DB2_LIBRARIES) +mark_as_advanced(DB2_INCLUDE_DIR DB2_LIBRARY) include(FeatureSummary) set_package_properties(DB2 PROPERTIES URL "https://www.ibm.com" DESCRIPTION "IBM DB2 client library") -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(DB2 DEFAULT_MSG DB2_INCLUDE_DIRS DB2_LIBRARIES) |