CMake: clean up FindGNUTLS.cmake

Use consistent capitalization and whitespace. Remove library names from
find_library that are unsuitable. No functional change intended.

Change-Id: Ic40516542777d768b6eef656fe5c0a0af143fb7e
Reviewed-on: https://code.wireshark.org/review/31264
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 27 insertions, 39 deletions

diff --git a/cmake/modules/FindGNUTLS.cmake b/cmake/modules/FindGNUTLS.cmake
index 95c7a2467d..9028529848 100644
--- a/cmake/modules/FindGNUTLS.cmake
+++ b/cmake/modules/FindGNUTLS.cmake
@@ -9,41 +9,31 @@
 #  GNUTLS_DLLS         - (Windows) List of required GnuTLS DLLs.
 
 
-IF (GNUTLS_INCLUDE_DIRS)
+if(GNUTLS_INCLUDE_DIRS)
   # Already in cache, be silent
-  SET(GNUTLS_FIND_QUIETLY TRUE)
-ENDIF (GNUTLS_INCLUDE_DIRS)
+  set(GNUTLS_FIND_QUIETLY TRUE)
+endif()
 
-INCLUDE(FindWSWinLibs)
-FindWSWinLibs("gnutls-.*" "GNUTLS_HINTS")
+include(FindWSWinLibs)
+findwswinlibs("gnutls-.*" "GNUTLS_HINTS")
 
-if (NOT WIN32)
+if(NOT WIN32)
   find_package(PkgConfig)
   pkg_search_module(GNUTLS gnutls)
 endif()
 
 # sources include gnutls/gnutls.h, look for that location instead of gnutls.h.
-FIND_PATH(GNUTLS_INCLUDE_DIR
+find_path(GNUTLS_INCLUDE_DIR
   NAMES
     gnutls/gnutls.h
-  PATH_SUFFIXES
-    include
   HINTS
     "${GNUTLS_INCLUDEDIR}"
-    "${GNUTLS_HINTS}"
+    "${GNUTLS_HINTS}/include"
 )
 
-SET(GNUTLS_NAMES gnutls libgnutls-28 libgnutls-30)
-SET(HOGWEED_NAMES libhogweed-2-4 libhogweed-4-2)
-SET(NETTLE_NAMES libnettle-4-6 libnettle-6-2)
-FIND_LIBRARY(GNUTLS_LIBRARY
+find_library(GNUTLS_LIBRARY
   NAMES
-    ${GNUTLS_NAMES}
-    ${HOGWEED_NAMES}
-    ${NETTLE_NAMES}
-    libgmp-10 libgcc_s_sjlj-1 libffi-6
-    libp11-kit-0 libtasn1-6
-    libwinpthread-1
+    gnutls libgnutls-28 libgnutls-30
   HINTS
     "${GNUTLS_LIBDIR}"
     "${GNUTLS_HINTS}/bin"
@@ -60,22 +50,20 @@ if(NOT GNUTLS_VERSION)
   endif()
 endif()
 
-# handle the QUIETLY and REQUIRED arguments and set GNUTLS_FOUND to TRUE if
-# all listed variables are TRUE and the requested version matches.
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNUTLS
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GNUTLS
   REQUIRED_VARS   GNUTLS_LIBRARY GNUTLS_INCLUDE_DIR
   VERSION_VAR     GNUTLS_VERSION)
 
-IF(GNUTLS_FOUND)
-  SET( GNUTLS_LIBRARIES ${GNUTLS_LIBRARY} )
-  SET( GNUTLS_INCLUDE_DIRS ${GNUTLS_INCLUDE_DIR} )
-  if (WIN32)
-    set ( GNUTLS_DLL_DIR "${GNUTLS_HINTS}/bin"
+if(GNUTLS_FOUND)
+  set(GNUTLS_LIBRARIES ${GNUTLS_LIBRARY})
+  set(GNUTLS_INCLUDE_DIRS ${GNUTLS_INCLUDE_DIR})
+  if(WIN32)
+    set(GNUTLS_DLL_DIR "${GNUTLS_HINTS}/bin"
       CACHE PATH "Path to the GnuTLS DLLs"
     )
     # Note: 32-bit glib2-2.52.2-1.34-win32ws needs libgcc_s_sjlj-1.dll too.
-    file( GLOB _gnutls_dlls RELATIVE "${GNUTLS_DLL_DIR}"
+    file(GLOB _gnutls_dlls RELATIVE "${GNUTLS_DLL_DIR}"
       "${GNUTLS_DLL_DIR}/libgmp-*.dll"
       "${GNUTLS_DLL_DIR}/libgcc_s_*.dll"
       "${GNUTLS_DLL_DIR}/libffi-*.dll"
@@ -86,17 +74,17 @@ IF(GNUTLS_FOUND)
       "${GNUTLS_DLL_DIR}/libtasn1-*.dll"
       "${GNUTLS_DLL_DIR}/libwinpthread-*.dll"
     )
-    set ( GNUTLS_DLLS ${_gnutls_dlls}
+    set(GNUTLS_DLLS ${_gnutls_dlls}
       # We're storing filenames only. Should we use STRING instead?
       CACHE FILEPATH "GnuTLS DLL list"
     )
-    mark_as_advanced( GNUTLS_DLL_DIR GNUTLS_DLLS )
+    mark_as_advanced(GNUTLS_DLL_DIR GNUTLS_DLLS)
   endif()
-ELSE(GNUTLS_FOUND)
-  SET( GNUTLS_LIBRARIES )
-  SET( GNUTLS_INCLUDE_DIRS )
-  SET( GNUTLS_DLL_DIR )
-  SET( GNUTLS_DLLS )
-ENDIF(GNUTLS_FOUND)
+else()
+  set(GNUTLS_LIBRARIES)
+  set(GNUTLS_INCLUDE_DIRS)
+  set(GNUTLS_DLL_DIR)
+  set(GNUTLS_DLLS)
+endif()
 
-MARK_AS_ADVANCED( GNUTLS_LIBRARIES GNUTLS_INCLUDE_DIRS )
+mark_as_advanced(GNUTLS_LIBRARIES GNUTLS_INCLUDE_DIRS)