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/FindOracle.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/FindOracle.cmake')
| -rw-r--r-- | cmake/FindOracle.cmake | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/cmake/FindOracle.cmake b/cmake/FindOracle.cmake index 932f186f2e..38860abb8c 100644 --- a/cmake/FindOracle.cmake +++ b/cmake/FindOracle.cmake @@ -18,33 +18,33 @@ # ``Oracle::Oracle`` # The oracle instant client library -find_path(Oracle_INCLUDE_DIRS +find_path(Oracle_INCLUDE_DIR NAMES oci.h HINTS ${Oracle_INCLUDE_DIR}) set(ORACLE_OCI_NAMES clntsh ociei oraociei12 oci) -find_library(Oracle_LIBRARIES - NAMES NAMES ${ORACLE_OCI_NAMES} +find_library(Oracle_LIBRARY + NAMES ${ORACLE_OCI_NAMES} HINTS ${Oracle_LIBRARY_DIR}) -if (NOT Oracle_INCLUDE_DIRS STREQUAL "Oracle_INCLUDE_DIRS-NOTFOUND" AND NOT Oracle_LIBRARIES STREQUAL "Oracle_LIBRARIES-NOTFOUND") - set(Oracle_FOUND ON) -endif() - -if(Oracle_FOUND AND NOT TARGET Oracle::OCI) - add_library(Oracle::OCI UNKNOWN IMPORTED) - set_target_properties(Oracle::OCI PROPERTIES +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Oracle DEFAULT_MSG Oracle_LIBRARY Oracle_INCLUDE_DIR) + +if(Oracle_FOUND) + set(Oracle_INCLUDE_DIRS "${Oracle_INCLUDE_DIR}") + set(Oracle_LIBRARIES "${Oracle_LIBRARY}") + if(NOT TARGET Oracle::OCI) + add_library(Oracle::OCI UNKNOWN IMPORTED) + set_target_properties(Oracle::OCI PROPERTIES IMPORTED_LOCATION "${Oracle_LIBRARIES}" INTERFACE_INCLUDE_DIRECTORIES "${Oracle_INCLUDE_DIRS}") + endif() endif() -mark_as_advanced(Oracle_INCLUDE_DIRS Oracle_LIBRARIES) +mark_as_advanced(Oracle_INCLUDE_DIR Oracle_LIBRARY) include(FeatureSummary) set_package_properties(Oracle PROPERTIES URL "https://www.oracle.com" DESCRIPTION "Oracle client library") - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Oracle DEFAULT_MSG Oracle_INCLUDE_DIRS Oracle_LIBRARIES) |