review CMake modules

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/cmake/modules/FindIconv.cmake b/cmake/modules/FindIconv.cmake
index cd45585..345a3d7 100644 (file)
--- a/cmake/modules/FindIconv.cmake
+++ b/cmake/modules/FindIconv.cmake
@@ -32,6 +32,8 @@ find_library(ICONV_LIBRARIES
 )
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Iconv DEFAULT_MSG ICONV_INCLUDES ICONV_LIBRARIES)
+find_package_handle_standard_args(Iconv
+    REQUIRED_VARS ICONV_INCLUDES ICONV_LIBRARIES
+)
 
 mark_as_advanced(ICONV_INCLUDES ICONV_LIBRARIES)

diff --git a/cmake/modules/FindNIS.cmake b/cmake/modules/FindNIS.cmake
index 3f0128a..3717c74 100644 (file)
--- a/cmake/modules/FindNIS.cmake
+++ b/cmake/modules/FindNIS.cmake
@@ -31,6 +31,8 @@ find_library(NIS_LIBRARIES
 )
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(NIS DEFAULT_MSG NIS_INCLUDES NIS_LIBRARIES)
+find_package_handle_standard_args(NIS
+    REQUIRED_VARS NIS_INCLUDES NIS_LIBRARIES
+)
 
 mark_as_advanced(NIS_INCLUDES NIS_LIBRARIES)

diff --git a/cmake/modules/FindNSL.cmake b/cmake/modules/FindNSL.cmake
index 2ef8c1d..af729c9 100644 (file)
--- a/cmake/modules/FindNSL.cmake
+++ b/cmake/modules/FindNSL.cmake
@@ -32,6 +32,8 @@ find_library(NSL_LIBRARIES
 )
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(NSL DEFAULT_MSG NSL_INCLUDES NSL_LIBRARIES)
+find_package_handle_standard_args(NSL
+    REQUIRED_VARS NSL_INCLUDES NSL_LIBRARIES
+)
 
 mark_as_advanced(NSL_INCLUDES NSL_LIBRARIES)

diff --git a/cmake/modules/FindODBC.cmake b/cmake/modules/FindODBC.cmake
index a65a586..0af2d54 100644 (file)
--- a/cmake/modules/FindODBC.cmake
+++ b/cmake/modules/FindODBC.cmake
@@ -13,7 +13,13 @@ if(ODBC_INCLUDES AND ODBC_LIBRARIES)
     set(ODBC_FIND_QUIETLY TRUE)
 endif()
 
-# ODBC does not provide pkg-config files
+if(NOT WIN32)
+    include(FindPkgConfig)
+    pkg_check_modules(PC_ODBC QUIET odbc)
+    if(NOT PC_ODBC_FOUND)
+        pkg_check_modules(PC_ODBC QUIET libiodbc)
+    endif()
+endif()
 
 find_path(ODBC_INCLUDES
     NAMES
@@ -21,17 +27,23 @@ find_path(ODBC_INCLUDES
     PATH_SUFFIXES iodbc libiodbc
     HINTS
     $ENV{ODBCDIR}/include
+    ${PC_ODBC_INCLUDEDIR}
     ${INCLUDE_INSTALL_DIR}
 )
 
 find_library(ODBC_LIBRARIES
+    NAMES
     odbc iodbc
     HINTS
     $ENV{ODBCDIR}/lib
+    ${PC_ODBC_LIBDIR}
     ${LIB_INSTALL_DIR}
 )
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(ODBC DEFAULT_MSG ODBC_INCLUDES ODBC_LIBRARIES)
+find_package_handle_standard_args(ODBC
+    VERSION_VAR PC_ODBC_VERSION
+    REQUIRED_VARS ODBC_INCLUDES ODBC_LIBRARIES
+)
 
 mark_as_advanced(ODBC_INCLUDES ODBC_LIBRARIES)

diff --git a/cmake/modules/FindResolv.cmake b/cmake/modules/FindResolv.cmake
index 55e58dd..1e23dd7 100644 (file)
--- a/cmake/modules/FindResolv.cmake
+++ b/cmake/modules/FindResolv.cmake
@@ -32,6 +32,8 @@ find_library(RESOLV_LIBRARIES
 )
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Resolv DEFAULT_MSG RESOLV_INCLUDES RESOLV_LIBRARIES)
+find_package_handle_standard_args(Resolv
+    REQUIRED_VARS RESOLV_INCLUDES RESOLV_LIBRARIES
+)
 
 mark_as_advanced(RESOLV_INCLUDES RESOLV_LIBRARIES)